From f5f397debde141a15225ea52bc2768d723a27375 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Tue, 18 Dec 2007 14:50:18 -0500 Subject: ENH: should define QT_DLL instead of QT_SHARED --- Modules/FindQt4.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 890ed37..9a6d9ce 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1143,12 +1143,11 @@ IF (QT4_QMAKE_FOUND) SET(QT_GUI_LIB_DEPENDENCIES "") SET(QT_CORE_LIB_DEPENDENCIES "") - # shared build needs -DQT_SHARED + # build using shared Qt needs -DQT_DLL IF(NOT QT_CONFIG MATCHES "static") # warning currently only qconfig.pri on Windows potentially contains "static" - # so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now) - # Trolltech said they'd consider exporting it for all platforms in future releases. - SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED) + # so QT_DLL might not get defined properly on other platforms. + SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL) ENDIF(NOT QT_CONFIG MATCHES "static") ## system png -- cgit v0.12