r16927 by craig - #10328: Only set QT_MAC_USE_COCOA IF(APPLE)
scribus-commit
scribus-commit at lists.scribus.net
Sun Oct 23 20:12:04 UTC 2011
Author: craig
Date: Sun Oct 23 20:12:04 2011
New Revision: 16927
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16927
Log:
#10328: Only set QT_MAC_USE_COCOA IF(APPLE)
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16927&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Oct 23 20:12:04 2011
@@ -449,9 +449,12 @@
#<< Qt
SET (QT_MT_REQUIRED TRUE)
SET (QT_MIN_VERSION "4.6.0")
-IF (WANT_QT4MAC_COCOA)
- SET (QT_MAC_USE_COCOA TRUE)
-ENDIF (WANT_QT4MAC_COCOA)
+IF (APPLE)
+ IF (WANT_QT4MAC_COCOA)
+ SET (QT_MAC_USE_COCOA TRUE)
+ ENDIF (WANT_QT4MAC_COCOA)
+ SET( QT_USE_QTSQL TRUE )
+ENDIF (APPLE)
IF (WANT_QT3SUPPORT)
SET (QT_USE_QT3SUPPORT TRUE)
ELSE (WANT_QT3SUPPORT)
@@ -460,9 +463,6 @@
SET (QT_USE_QTXML TRUE )
SET (QT_USE_QTWEBKIT TRUE )
SET (QT_USE_QTOPENGL TRUE )
-IF (APPLE)
- SET( QT_USE_QTSQL TRUE )
-ENDIF (APPLE)
SET( QT_USE_QTNETWORK TRUE )
FIND_PACKAGE(Qt4 REQUIRED)
INCLUDE( ${QT_USE_FILE} )
More information about the scribus-commit
mailing list