diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:32:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:45:05 +0100 |
| commit | 96232be1466e8c059c270b611ce7c32997ff60a9 (patch) | |
| tree | 9bf47c0c2c84556415eee7f938a098ae7e542649 /mkspecs/unsupported | |
| parent | 8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1 (diff) | |
| parent | fb8c95bac09910c4dfa476ab97c6206b2e94ee53 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp
Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/integrity-ghs/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/linux-host-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | 3 |
5 files changed, 0 insertions, 15 deletions
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf index 54253edc8f..7f2ac2fb04 100644 --- a/mkspecs/unsupported/integrity-ghs/qmake.conf +++ b/mkspecs/unsupported/integrity-ghs/qmake.conf @@ -50,9 +50,6 @@ QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf index 1ad529ebae..2e0b7dba44 100644 --- a/mkspecs/unsupported/linux-host-g++/qmake.conf +++ b/mkspecs/unsupported/linux-host-g++/qmake.conf @@ -108,9 +108,6 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = host-ar cqs QMAKE_OBJCOPY = host-objcopy QMAKE_RANLIB = diff --git a/mkspecs/unsupported/qnx-g++/qmake.conf b/mkspecs/unsupported/qnx-g++/qmake.conf index 83c4a26e06..bc96c21e9f 100644 --- a/mkspecs/unsupported/qnx-g++/qmake.conf +++ b/mkspecs/unsupported/qnx-g++/qmake.conf @@ -37,9 +37,6 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = QMAKE_LIBS_NETWORK = -lsocket -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf index a3b571b144..10f2627d66 100644 --- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf @@ -84,9 +84,6 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_NETWORK = # -lnetwrap # only needed if kernel is missing gethostbyname and friends -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf index 8bdf1c5011..c3c974e3e7 100644 --- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf @@ -83,9 +83,6 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = QMAKE_LIBS_NETWORK = # -lnet # only needed if kernel is missing gethostbyname and friends -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = |