diff --git a/src/qtcreatortool.pri b/src/qtcreatortool.pri new file mode 100644 index 00000000000..b34a72eefce --- /dev/null +++ b/src/qtcreatortool.pri @@ -0,0 +1,11 @@ +include(../qtcreator.pri) +include(rpath.pri) + +TEMPLATE = app + +CONFIG += console +CONFIG -= app_bundle + +DESTDIR = $${IDE_LIBEXEC_PATH} +target.path = $${QTC_PREFIX}/bin # FIXME: libexec, more or less +INSTALLS += target diff --git a/src/tools/buildoutputparser/buildoutputparser.pro b/src/tools/buildoutputparser/buildoutputparser.pro index 207890898ed..53cb6b44343 100644 --- a/src/tools/buildoutputparser/buildoutputparser.pro +++ b/src/tools/buildoutputparser/buildoutputparser.pro @@ -1,21 +1,13 @@ -TEMPLATE = app -TARGET = buildoutputparser QTC_LIB_DEPENDS = utils QTC_PLUGIN_DEPENDS = projectexplorer qtsupport qmakeprojectmanager - QT = core gui -CONFIG += console -CONFIG -= app_bundle -include(../../../qtcreator.pri) -include(../../rpath.pri) +include(../../qtcreatortool.pri) + +TARGET = buildoutputparser win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER -DESTDIR = $$IDE_BIN_PATH -target.path = $$QTC_PREFIX/bin -INSTALLS += target - SOURCES = \ main.cpp \ outputprocessor.cpp diff --git a/src/tools/qtcdebugger/qtcdebugger.pro b/src/tools/qtcdebugger/qtcdebugger.pro index 82d230c2e29..41c0d4af616 100644 --- a/src/tools/qtcdebugger/qtcdebugger.pro +++ b/src/tools/qtcdebugger/qtcdebugger.pro @@ -1,15 +1,9 @@ include(../../shared/registryaccess/registryaccess.pri) +include(../../qtcreatortool.pri) QT += widgets TARGET = qtcdebugger -TEMPLATE = app SOURCES += main.cpp -DESTDIR=../../../bin - -target.path=$$QTC_PREFIX/bin -INSTALLS+=target - -include(../../../qtcreator.pri) app_info.input = $$PWD/../../app/app_version.h.in app_info.output = $$OUT_PWD/app_version.h QMAKE_SUBSTITUTES += app_info diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.pro b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.pro index a60d958c10b..2d1538a3d2c 100644 --- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.pro +++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.pro @@ -1,10 +1,6 @@ -include(../../../qtcreator.pri) +include(../../qtcreatortool.pri) TARGET = qtcreator_crash_handler -DESTDIR = $$IDE_LIBEXEC_PATH - -CONFIG -= app_bundle -TEMPLATE = app SOURCES += \ main.cpp \ @@ -32,6 +28,3 @@ HEADERS += \ FORMS += \ crashhandlerdialog.ui - -target.path = $$QTC_PREFIX/bin -INSTALLS += target diff --git a/src/tools/qtpromaker/qtpromaker.pro b/src/tools/qtpromaker/qtpromaker.pro index b61d1cee33b..6149a6a77db 100644 --- a/src/tools/qtpromaker/qtpromaker.pro +++ b/src/tools/qtpromaker/qtpromaker.pro @@ -1,15 +1,9 @@ QT -= gui -include(../../../qtcreator.pri) +include(../../qtcreatortool.pri) -TEMPLATE = app TARGET = qtpromaker -DESTDIR = $$IDE_LIBEXEC_PATH -CONFIG += console warn_on -CONFIG -= app_bundle +CONFIG += warn_on SOURCES += main.cpp - -target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less -INSTALLS += target diff --git a/src/tools/sdktool/sdktool.pro b/src/tools/sdktool/sdktool.pro index 8ec43b8ce0d..72edc66b75a 100644 --- a/src/tools/sdktool/sdktool.pro +++ b/src/tools/sdktool/sdktool.pro @@ -1,11 +1,7 @@ QTC_LIB_DEPENDS += \ utils -include(../../../qtcreator.pri) -include(../../rpath.pri) - -CONFIG += console -CONFIG -= app_bundle +include(../../qtcreatortool.pri) QT -= gui test @@ -50,9 +46,5 @@ HEADERS += \ rmtoolchainoperation.h \ settings.h \ -DESTDIR=$$IDE_LIBEXEC_PATH macx:DEFINES += "DATA_PATH=\"\\\".\\\"\"" else:DEFINES += "DATA_PATH=\"\\\"../share/qtcreator\\\"\"" - -target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less -INSTALLS += target diff --git a/src/tools/wininterrupt/wininterrupt.pro b/src/tools/wininterrupt/wininterrupt.pro index b306db179f1..b7fd91db44c 100644 --- a/src/tools/wininterrupt/wininterrupt.pro +++ b/src/tools/wininterrupt/wininterrupt.pro @@ -1,7 +1,7 @@ -CONFIG += warn_on console use_c_linker static -CONFIG -= qt app_bundle +CONFIG += warn_on use_c_linker static +CONFIG -= qt -include(../../../qtcreator.pri) +include(../../qtcreatortool.pri) # Switch to statically linked CRT. Note: There will be only one # global state of the CRT, reconsider if other DLLs are required! @@ -18,9 +18,6 @@ win32-msvc* { SOURCES = wininterrupt.c -TEMPLATE = app -DESTDIR = $$IDE_LIBEXEC_PATH - build_all:!build_pass { CONFIG -= build_all CONFIG += release @@ -35,6 +32,3 @@ contains(ENV_CPU, ^AMD64$) { } else { TARGET = win32interrupt } - -target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less -INSTALLS += target diff --git a/src/tools/winrtdebughelper/winrtdebughelper.pro b/src/tools/winrtdebughelper/winrtdebughelper.pro index cdeaf207e00..f5ed88de9f4 100644 --- a/src/tools/winrtdebughelper/winrtdebughelper.pro +++ b/src/tools/winrtdebughelper/winrtdebughelper.pro @@ -1,10 +1,8 @@ -CONFIG += warn_on console -CONFIG -= qt app_bundle +CONFIG += warn_on +CONFIG -= qt -include(../../../qtcreator.pri) +include(../../qtcreatortool.pri) -TEMPLATE = app -DESTDIR = $$IDE_LIBEXEC_PATH SOURCES = winrtdebughelper.cpp build_all:!build_pass { @@ -13,5 +11,3 @@ build_all:!build_pass { } TARGET = winrtdebughelper -target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less -INSTALLS += target