[QGIS Commit] r10706 - in trunk/qgis/mac/xcode: . Qgis.xcodeproj

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-05-02 17:54:35 -0400 (Sat, 02 May 2009)
New Revision: 10706

Modified:
   trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
   trunk/qgis/mac/xcode/qgis_settings.xcconfig
Log:
remove Qt3 remains from GRASS plugin

Modified: trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
===================================================================
--- trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-05-02 19:38:46 UTC (rev 10705)
+++ trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-05-02 21:54:35 UTC (rev 10706)
@@ -17083,8 +17083,6 @@
 					"GRASS_EXPORT=",
 					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
 					"HAVE_OPENPTY=$(HAVE_OPENPTY)",
-					QT3_SUPPORT,
-					QT_3SUPPORT_LIB,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "GRASS_BASE=\\\"$(GRASS_PREFIX)\\\"";
 				HEADER_SEARCH_PATHS = (
@@ -17102,7 +17100,6 @@
 					"$(GRASS_INC)",
 					"$(GDAL_INC)",
 					"$(PROJ_INC)",
-					"$(QT_INC_QT3)",
 				);
 				HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
 				LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@@ -17135,8 +17132,6 @@
 					"GRASS_EXPORT=",
 					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
 					"HAVE_OPENPTY=$(HAVE_OPENPTY)",
-					QT3_SUPPORT,
-					QT_3SUPPORT_LIB,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "GRASS_BASE=\\\"$(GRASS_PREFIX)\\\"";
 				HEADER_SEARCH_PATHS = (
@@ -17154,7 +17149,6 @@
 					"$(GRASS_INC)",
 					"$(GDAL_INC)",
 					"$(PROJ_INC)",
-					"$(QT_INC_QT3)",
 				);
 				HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
 				LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";

Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-05-02 19:38:46 UTC (rev 10705)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-05-02 21:54:35 UTC (rev 10706)
@@ -193,18 +193,16 @@
 QTDEFS_Debug = -DQT_DEBUG
 QTDEFS_Release = -DQT_NO_DEBUG
 QT_CXXFLAGS_APP = $(PGSQL_HAVE)
-QT_INC_QT3 = /Library/Frameworks/Qt3Support.framework/Headers
 QT_LIB_CORE = -framework QtCore
 QT_LIB_GUI = -framework QtGui
 QT_LIB_NET = -framework QtNetwork
 QT_LIB_XML = -framework QtXml
 QT_LIB_SVG = -framework QtSvg
 QT_LIB_SQL = -framework QtSql
-QT_LIB_QT3 = -framework Qt3Support
 // convenience for all Qt:
 QT_LIB = $(QT_LIB_CORE) $(QT_LIB_GUI) $(QT_LIB_NET) $(QT_LIB_XML) $(QT_LIB_SVG) $(QT_LIB_SQL)
 // list of Qt frameworks used
-QTLISTQG = Qt3Support QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit
+QTLISTQG = QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit
 // list of PyQt modules used
 PYQTLIST = Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit