Skip to content
Permalink
Browse files

remove Qt3 remains from GRASS plugin

git-svn-id: http://svn.osgeo.org/qgis/trunk@10706 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos
kyngchaos committed May 2, 2009
1 parent c2d0a40 commit 72e32a221ef459902e7bf58a766d0d338a2bd24d
Showing with 1 addition and 9 deletions.
  1. +0 −6 mac/xcode/Qgis.xcodeproj/project.pbxproj
  2. +1 −3 mac/xcode/qgis_settings.xcconfig
"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 = (
"$(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)";
"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 = (
"$(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)";
@@ -193,18 +193,16 @@ QT_CXXFLAGS = -DQT_DLL -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_
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

0 comments on commit 72e32a2

Please sign in to comment.
You can’t perform that action at this time.