From f137d5bdad5fdedb3d5185f19059799c1d602e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sat, 18 Aug 2007 12:45:11 +0000 Subject: [PATCH] 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 --- development/cmake/CMakeLists.txt | 5 +---- development/cmake/src/frontends/qt4/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index d2b5364398..9e1b41fb77 100644 --- 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 703c07c47f..9a0f3e0537 100644 --- 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 )