diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:23:04 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:26:30 (GMT) |
| commit | a969cc4375186a6875ef450f042dad77f62ee3a8 (patch) | |
| tree | 7f932b991e5ebd831b43b5c3e298bd0f09bb2e18 /mkspecs/unsupported | |
| parent | 0956624f7f20665fa4b789654a022a97cdda90c9 (diff) | |
| download | Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.zip Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.gz Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.bz2 | |
Don't use scopes in mkspecs as configure does not support them
Configure has very basic parsing of mkspecs where it traverses
includes, but assumes that the last seen value is the right one.
Since this parsing does not take scopes into account we can't
use tricks like isEmpty().
Reviewed-by: ossi
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/linux-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/macx-clang/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/unsupported/linux-clang/qmake.conf b/mkspecs/unsupported/linux-clang/qmake.conf index 65eba7b..6b63b7a 100644 --- a/mkspecs/unsupported/linux-clang/qmake.conf +++ b/mkspecs/unsupported/linux-clang/qmake.conf @@ -11,8 +11,8 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) -include(../../common/clang.conf) include(../../common/gcc-base-unix.conf) +include(../../common/clang.conf) QMAKE_LFLAGS += -ccc-gcc-name g++ diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/unsupported/macx-clang/qmake.conf index aaabf27..3191344 100644 --- a/mkspecs/unsupported/macx-clang/qmake.conf +++ b/mkspecs/unsupported/macx-clang/qmake.conf @@ -10,8 +10,8 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib include(../../common/mac.conf) -include(../../common/clang.conf) include(../../common/gcc-base-macx.conf) +include(../../common/clang.conf) QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE |