diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 23:07:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 23:07:29 (GMT) |
| commit | 3ecc5f89024ebb986f2fed0205de517e69f230cd (patch) | |
| tree | bee2225a3f71934bc818b319014302cd1a5c412f /mkspecs/unsupported | |
| parent | 187185bf246b63f080cf2a59b6768756b399e72c (diff) | |
| parent | aa88b7044dd86850e6986aa80104bb38bb7b12eb (diff) | |
| download | Qt-3ecc5f89024ebb986f2fed0205de517e69f230cd.zip Qt-3ecc5f89024ebb986f2fed0205de517e69f230cd.tar.gz Qt-3ecc5f89024ebb986f2fed0205de517e69f230cd.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: (30 commits)
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
Add more microbenchmarks for QScriptEngine
QNAM HTTP: Do not set cache headers when already set by user
QNAM: Do not cache network connections per username.
Refactor tst_QScriptValue::instanceOf
Refactor tst_QScriptValue::getSetPrototype
Refactor tst_QScriptValue::getSetProperty
Refactor tst_QScriptValue::getSetData
Refactor tst_QScriptValue::isError
Refactor tst_QScriptValue::isRegExp
Refactor tst_QScriptValue::isDate
Refactor tst_QScriptValue::isArray
Increase range of getSetScriptClass test.
Rename few QScriptValue's test cases.
Separate generated tests from hand written ones.
Split tst_QScriptValue::getSetScriptClass autotest.
...
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/macx-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/unsupported/macx-clang/qmake.conf index 17892e8..aaabf27 100644 --- a/mkspecs/unsupported/macx-clang/qmake.conf +++ b/mkspecs/unsupported/macx-clang/qmake.conf @@ -11,7 +11,7 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../../common/mac.conf) include(../../common/clang.conf) -include(../../common/gcc-base-mac.conf) +include(../../common/gcc-base-macx.conf) QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf index 26de9b7..bb760b2 100644 --- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf @@ -61,7 +61,6 @@ QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, -#include(../../common/g++.conf) include(../../common/unix.conf) QMAKE_CFLAGS_THREAD = -D_REENTRANT |