diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-06 16:41:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 15:47:28 +0100 |
| commit | 635bfd66068269547575115c2a46c6a5e1ddac36 (patch) | |
| tree | a01bbfa3ea474520d03aef36d6190a3f1e9cb3f7 /src/corelib/tools/tools.pri | |
| parent | 6f1b82fccdaf202856dcc6510c16b0531680fe23 (diff) | |
Move no-pch extra compiler to common features
As we add more classes with RValue ref qualified methods we will need
the same _compat trick and no-pch support as QString.
This patch moves the extra compiler to precompile_header.prf which is
automatically included when pch is used.
Change-Id: I422a355fd11f499ce0648a90b0385f2a6f699fcb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index c69d270e33..ce3a6f9e8c 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -115,7 +115,7 @@ SOURCES += \ tools/qvsnprintf.cpp NO_PCH_SOURCES = tools/qstring_compat.cpp -false: SOURCES += $$NO_PCH_SOURCES +false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator !nacl:mac: { SOURCES += tools/qelapsedtimer_mac.cpp @@ -198,14 +198,3 @@ INCLUDEPATH += ../3rdparty/md5 \ !macx-icc:!vxworks:unix:LIBS_PRIVATE += -lm TR_EXCLUDE += ../3rdparty/* - -no_pch_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -win32:!gcc:no_pch_compiler.commands += -Fo${QMAKE_FILE_OUT} -else:no_pch_compiler.commands += -o ${QMAKE_FILE_OUT} -no_pch_compiler.dependency_type = TYPE_C -no_pch_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -no_pch_compiler.input = NO_PCH_SOURCES -no_pch_compiler.variable_out = OBJECTS -no_pch_compiler.name = compiling[no_pch] ${QMAKE_FILE_IN} -silent:no_pch_compiler.commands = @echo compiling[no_pch] ${QMAKE_FILE_IN} && $$no_pch_compiler.commands -QMAKE_EXTRA_COMPILERS += no_pch_compiler |