From: Peter Kümmel <syntheticpp@gmx.net>
Date: Mon, 28 Aug 2006 16:41:48 +0000 (+0000)
Subject: qt should not pollute the namespace
X-Git-Tag: 1.6.10~12686
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bbc672ae9872b335a3882aed889b5865db9f5ddb;p=features.git

qt should not pollute the namespace

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

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index e329846ee4..0db9b94d96 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -12,7 +12,12 @@ lyx_add_ui_files(frontends_qt4_sources ${frontend_qt4_UI})
 
 source_group("Uic files" FILES ${frontend_qt4_UI})
 
-add_definitions(-DQT_NO_STL)
+add_definitions(
+		-DQT_CLEAN_NAMESPACE
+		-DQT_GENUINE_STR
+		-DQT_NO_STL
+		-DQT_NO_KEYWORDS
+		)
 
 include_directories(	${TOP_SRC_DIR}/src/frontends/qt4 
 			${TOP_SRC_DIR}/src/frontends/controllers