diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-12 11:35:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-19 11:35:36 +0000 |
| commit | 1d2337f03278a6c5b9b09bc8649e6dcda268ef3e (patch) | |
| tree | 2d1ed173ea7edcebb3f89fc47e920d4257e75a3f | |
| parent | 69eec9bf44af108e33d179aea8403964bd122ac5 (diff) | |
use TEMPLATE = aux instead of bizarre phony target hack
we don't support building with VS or Xcode anyway.
qt creator did the same move recently.
Change-Id: Iabfbe713be5954f167f0a8a4c431bd9e935c7e20
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | static.pro | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/static.pro b/static.pro index 75fc7ca0c..bfcd032fa 100644 --- a/static.pro +++ b/static.pro @@ -1,25 +1,4 @@ -TEMPLATE = app -TARGET = phony_target -CONFIG -= qt sdk separate_debug_info gdb_dwarf_index -QT = -LIBS = -macx:CONFIG -= app_bundle - -isEmpty(vcproj) { - QMAKE_LINK = @: IGNORE THIS LINE - OBJECTS_DIR = - win32:CONFIG -= embed_manifest_exe -} else { - CONFIG += console - PHONY_DEPS = . - phony_src.input = PHONY_DEPS - phony_src.output = phony.c - phony_src.variable_out = GENERATED_SOURCES - phony_src.commands = echo int main() { return 0; } > phony.c - phony_src.name = CREATE phony.c - phony_src.CONFIG += combine - QMAKE_EXTRA_COMPILERS += phony_src -} +TEMPLATE = aux DATA_DIRS = share/qbs/imports share/qbs/modules win32:DATA_FILES = $$PWD/bin/ibmsvc.xml $$PWD/bin/ibqbs.bat @@ -57,11 +36,10 @@ OTHER_FILES += $$FILES copy2build.output = $${QBS_RESOURCES_BUILD_DIR}/${QMAKE_FUNC_FILE_IN_stripSrcDir} else: \ copy2build.output = ${QMAKE_FUNC_FILE_IN_stripSrcDir} - isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\" unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} - copy2build.CONFIG += no_link + copy2build.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += copy2build } |