diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 02:17:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 02:17:00 (GMT) |
| commit | 8b01937c36632fca8774e90d22ce2aaeb2df883d (patch) | |
| tree | 1f036bcd4d27744c7a4db995d07251ef0e7f3a45 /mkspecs/common/gcc-base.conf | |
| parent | 7f6deb2d42933f59adbebc95b872e670978de3e6 (diff) | |
| parent | 0c95cffd81a21f63f647dccd79ae425d157e9758 (diff) | |
| download | Qt-8b01937c36632fca8774e90d22ce2aaeb2df883d.zip Qt-8b01937c36632fca8774e90d22ce2aaeb2df883d.tar.gz Qt-8b01937c36632fca8774e90d22ce2aaeb2df883d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
configure: Deal with multiple redefinitions of qmake variables
Split QScriptValue::call autotest into smaller tests.
Optimize and clean up QClipData::fixup()
There is no predefined qmake x11 scope for x11 builds.
Refactor tst_QScriptContext::throwError test.
Fixed whitespace.
Don't use scopes in mkspecs as configure does not support them
Fixed destination path for the S60 feedback plugin.
Don't put Objective-C sources in SOURCES
Fix regression in tst_maketestselftest::naming_convention.
Split monolithic QScriptEngine autotests into smaller tests
Add SunSpider and V8 benchmarks to benchmarks/script.pro
Push and pop the thread-default context for the current thread
Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
Import SunSpider benchmarks for QtScript
Import V8 benchmarks for QtScript
Add more microbenchmarks for QScriptValue
...
Diffstat (limited to 'mkspecs/common/gcc-base.conf')
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 41280c6..0e90666 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -7,21 +7,21 @@ # # Platform-specific options shared by these compilers are put into: # -# - gcc-base-mac.conf +# - gcc-base-macx.conf # - gcc-base-unix.conf # # These base files are then combined with configurations for each compiler: # -# - g++.conf -# - g++-mac.conf +# - g++-base.conf +# - g++-macx.conf # - g++-unix.conf # - llvm.conf # - clang.conf # # The combination happens in the top level mkspec, by including a platform- -# specific version of the base-file, for example gcc-base-mac.conf, and then +# specific version of the base-file, for example gcc-base-macx.conf, and then # a (possibly platform-specific) version of the actual compiler configuration, -# for example g++-mac.conf. +# for example g++-macx.conf. # # If you are making changes to any of these files, please consider the # possible effect it may have due to these include-rules, and whether it @@ -31,9 +31,6 @@ # you can use the manual test in tests/manual/mkspecs. # -# Allow including configurations to override -isEmpty(QMAKE_CC): QMAKE_CC = gcc - QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W @@ -45,8 +42,6 @@ QMAKE_CFLAGS_STATIC_LIB += -fPIC QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -isEmpty(QMAKE_CXX): QMAKE_CXX = g++ - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON @@ -58,9 +53,6 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX - QMAKE_LFLAGS += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += |