Skip to content
Permalink
Browse files
conditionalize some Qt settings on version
git-svn-id: http://svn.osgeo.org/qgis/trunk@13173 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos committed Mar 27, 2010
1 parent a5526c8 commit 1b7edf02df5d93c129cc411c564c194dee024789
Showing with 15 additions and 8 deletions.
  1. +2 −2 mac/xcode/Qgis.xcodeproj/project.pbxproj
  2. +11 −4 mac/xcode/qgis_settings.xcconfig
  3. +2 −2 mac/xcode/qgis_user-template.xcconfig
@@ -19578,7 +19578,7 @@
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
QGIS_VERSION_BUILD = 13169;
QGIS_VERSION_BUILD = 13172;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Debug;
@@ -19589,7 +19589,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
QGIS_VERSION_BUILD = 13169;
QGIS_VERSION_BUILD = 13172;
STRIP_INSTALLED_PRODUCT = YES;
};
name = Release;
@@ -29,7 +29,7 @@ QGIS_VERSION_INT = 10500
// ***TODO*** - detect current version, only used in bundle script
QT_MVER = $(QT_VER_MAJOR) // keep for now so I don't have to change all scripts and deps
QT_VER_MAJOR = 4 // the install_name/major version
QT_VER_MINOR = 5 // minor version
QT_VER_MINOR = 6 // minor version
QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver

QT_DIR = /usr
@@ -51,7 +51,7 @@ PYRCC4 = $(PYTHON_USRBIN)/pyrcc4
SIP_INC = /usr/local/include
// from pyqtconfig.py
PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_$(QT_VER_MAJOR)_$(QT_VER_MINOR)_0 -x Py_v3 -g

BISON = /usr/bin/bison
GPSBABEL = /usr/local/bin/gpsbabel
@@ -232,13 +232,20 @@ QT_LIB_XML = -framework QtXml
QT_LIB_SVG = -framework QtSvg
QT_LIB_SQL = -framework QtSql
QT_LIB_WEBKIT = -framework QtWebKit
QT_LIB_DBUS = -framework QtDBus
QT_LIB_PHONON = -framework phonon
QT_LIB_UITOOLS = -L$(QT_DIR_SDK)/lib -lQtUiTools
// needed by webkit starting in Qt 4.5
QT_LIB_DBUS_4_4 =
QT_LIB_DBUS_4_5 = -framework QtDBus
QT_LIB_DBUS_4_6 = -framework QtDBus
QT_LIB_DBUS = $(QT_LIB_DBUS_$(QT_VER_MAJOR)_$(QT_VER_MINOR))
// 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 = QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit QtDBus phonon
QT_USE_4_4 =
QT_USE_4_5 = QtDBus
QT_USE_4_6 = QtDBus
QTLISTQG = QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit $(QT_USE_$(QT_VER_MAJOR)_$(QT_VER_MINOR)) phonon
// list of PyQt modules used
PYQTLIST = Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit phonon

@@ -22,7 +22,7 @@

//QT_MVER = $(QT_VER_MAJOR)
//QT_VER_MAJOR = 4 // the install_name/major version
//QT_VER_MINOR = 5 // minor version, currently unused
//QT_VER_MINOR = 6 // minor version, currently unused
//QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver

//QT_DIR = /usr
@@ -34,7 +34,7 @@
//QTBIN = /Developer/Tools/Qt // bin dir
//SIP_INC = /usr/local/include
//PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_$(QT_VER_MAJOR)_$(QT_VER_MINOR)_0 -x Py_v3 -g
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
//GPSBABEL = /usr/local/bin/gpsbabel

0 comments on commit 1b7edf0

Please sign in to comment.