Skip to content

Commit 2a4b3eb

Browse files
author
kyngchaos
committed
remove Qt3 remains from GRASS plugin
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10706 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 5bbbbf9 commit 2a4b3eb

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

mac/xcode/Qgis.xcodeproj/project.pbxproj

-6
Original file line numberDiff line numberDiff line change
@@ -17083,8 +17083,6 @@
1708317083
"GRASS_EXPORT=",
1708417084
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
1708517085
"HAVE_OPENPTY=$(HAVE_OPENPTY)",
17086-
QT3_SUPPORT,
17087-
QT_3SUPPORT_LIB,
1708817086
);
1708917087
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "GRASS_BASE=\\\"$(GRASS_PREFIX)\\\"";
1709017088
HEADER_SEARCH_PATHS = (
@@ -17102,7 +17100,6 @@
1710217100
"$(GRASS_INC)",
1710317101
"$(GDAL_INC)",
1710417102
"$(PROJ_INC)",
17105-
"$(QT_INC_QT3)",
1710617103
);
1710717104
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
1710817105
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@@ -17135,8 +17132,6 @@
1713517132
"GRASS_EXPORT=",
1713617133
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
1713717134
"HAVE_OPENPTY=$(HAVE_OPENPTY)",
17138-
QT3_SUPPORT,
17139-
QT_3SUPPORT_LIB,
1714017135
);
1714117136
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "GRASS_BASE=\\\"$(GRASS_PREFIX)\\\"";
1714217137
HEADER_SEARCH_PATHS = (
@@ -17154,7 +17149,6 @@
1715417149
"$(GRASS_INC)",
1715517150
"$(GDAL_INC)",
1715617151
"$(PROJ_INC)",
17157-
"$(QT_INC_QT3)",
1715817152
);
1715917153
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
1716017154
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";

mac/xcode/qgis_settings.xcconfig

+1-3
Original file line numberDiff line numberDiff line change
@@ -193,18 +193,16 @@ QT_CXXFLAGS = -DQT_DLL -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_
193193
QTDEFS_Debug = -DQT_DEBUG
194194
QTDEFS_Release = -DQT_NO_DEBUG
195195
QT_CXXFLAGS_APP = $(PGSQL_HAVE)
196-
QT_INC_QT3 = /Library/Frameworks/Qt3Support.framework/Headers
197196
QT_LIB_CORE = -framework QtCore
198197
QT_LIB_GUI = -framework QtGui
199198
QT_LIB_NET = -framework QtNetwork
200199
QT_LIB_XML = -framework QtXml
201200
QT_LIB_SVG = -framework QtSvg
202201
QT_LIB_SQL = -framework QtSql
203-
QT_LIB_QT3 = -framework Qt3Support
204202
// convenience for all Qt:
205203
QT_LIB = $(QT_LIB_CORE) $(QT_LIB_GUI) $(QT_LIB_NET) $(QT_LIB_XML) $(QT_LIB_SVG) $(QT_LIB_SQL)
206204
// list of Qt frameworks used
207-
QTLISTQG = Qt3Support QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit
205+
QTLISTQG = QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit
208206
// list of PyQt modules used
209207
PYQTLIST = Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit
210208

0 commit comments

Comments
 (0)