don't pollute the namespace with Qt macros

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19630 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index d2b536439800446daf06c3e925bffbe13553534b..9e1b41fb77366eda165335db083526651533ed78 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -98,10 +98,7 @@ endif(UNIX)
 set(qt_postfix qt4)
 project(lyx-${qt_postfix})
 find_package(Qt4 REQUIRED)
-# maybe anyway
-if(MERGE_FILES)
-       add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
-endif(MERGE_FILES)
+add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 703c07c47f49662e2b343eb776fa5d8354a359b1..9a0f3e05379a5877e71d95ecdee6babd17426b18 100644 (file)
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -18,10 +18,7 @@ lyx_automoc(${frontends_qt4_sources})
 lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI})
 
 add_definitions(
-               -DQT_CLEAN_NAMESPACE
                -DQT_GENUINE_STR
-               -DQT_NO_STL
-               -DQT_NO_KEYWORDS
                -DLYX_BUILD_QT4_FRONTEND
                )