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/common/g++-unix.conf | |
| 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/common/g++-unix.conf')
| -rw-r--r-- | mkspecs/common/g++-unix.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf index 09b3e90..96e301e 100644 --- a/mkspecs/common/g++-unix.conf +++ b/mkspecs/common/g++-unix.conf @@ -8,7 +8,7 @@ # you can use the manual test in tests/manual/mkspecs. # -include(g++.conf) +include(g++-base.conf) QMAKE_LFLAGS_RELEASE += -Wl,-O1 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined |