From 635bfd66068269547575115c2a46c6a5e1ddac36 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 6 Jan 2014 16:41:53 +0100 Subject: 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 --- src/corelib/tools/tools.pri | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/corelib/tools/tools.pri') 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 -- cgit v1.2.3