mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 18:08:10 +00:00
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
This commit is contained in:
parent
83d0919c21
commit
f137d5bdad
@ -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)
|
||||
|
||||
|
@ -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
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user