diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-23 13:19:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-08 12:54:11 +0000 |
| commit | 6c7d80e7c09aeaf09158dcacdd0faf350287a246 (patch) | |
| tree | 3f5de9e4fa1da1e1de6ea4f0dad87a5337206b63 /share | |
| parent | 0dc6de4e91461ee9448208dd1d6018e190d3d489 (diff) | |
Use aux templates instead of phony_targets
Change-Id: Idb5f64ab806ac06c286d5bebf7215fe2156a3435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/static.pro | 23 | ||||
| -rw-r--r-- | share/qtcreator/translations/translations.pro | 24 |
2 files changed, 3 insertions, 44 deletions
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index f22a875be1..42664508cf 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/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 STATIC_BASE = $$PWD diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index fdf6170e6f..3bfd35167d 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -1,3 +1,5 @@ +TEMPLATE = aux + include(../../../qtcreator.pri) LANGUAGES = cs de fr ja pl ru sl uk zh_CN zh_TW @@ -113,12 +115,6 @@ ts.commands = \ echo \"rename the file and re-run \'qmake\'.\" QMAKE_EXTRA_TARGETS += ts -TEMPLATE = app -TARGET = phony_target2 -CONFIG -= qt sdk separate_debug_info gdb_dwarf_index -QT = -LIBS = - updateqm.input = TRANSLATIONS updateqm.output = $$IDE_DATA_PATH/translations/${QMAKE_FILE_BASE}.qm isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS @@ -127,22 +123,6 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm -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 -} - qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtcreator_,.qm) qmfiles.path = $$INSTALL_DATA_PATH/translations qmfiles.CONFIG += no_check_exist |