diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 02:38:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 02:38:55 (GMT) |
| commit | c74cad19d010e4ee907706af4e73cfe1fc7f2e23 (patch) | |
| tree | 3baf71623082d2927e851b8afdd0c9b75ee9809f /mkspecs/common/clang.conf | |
| parent | aba9a891da354a1fbbadbb3a70d90a66f47d3f1d (diff) | |
| parent | 6d6b27203a5d28d7ed546110e9103d62b9060814 (diff) | |
| download | Qt-c74cad19d010e4ee907706af4e73cfe1fc7f2e23.zip Qt-c74cad19d010e4ee907706af4e73cfe1fc7f2e23.tar.gz Qt-c74cad19d010e4ee907706af4e73cfe1fc7f2e23.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: (40 commits)
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
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
...
Diffstat (limited to 'mkspecs/common/clang.conf')
| -rw-r--r-- | mkspecs/common/clang.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index f8ab0fe..069cdfa 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -5,6 +5,9 @@ QMAKE_CC = clang QMAKE_CXX = clang++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + CONFIG += clang_pch_style QMAKE_PCH_OUTPUT_EXT = .pch |