Introduce and make use of qtcreatortool.pri.

To factor out things common to (most) tools.

Change-Id: I5a4605f230d35280eda71e5f195d49d7bb929ae0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-06-10 13:16:45 +02:00
parent 973fabc782
commit 7309e8bb64
8 changed files with 25 additions and 59 deletions

11
src/qtcreatortool.pri Normal file
View File

@@ -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

View File

@@ -1,21 +1,13 @@
TEMPLATE = app
TARGET = buildoutputparser
QTC_LIB_DEPENDS = utils QTC_LIB_DEPENDS = utils
QTC_PLUGIN_DEPENDS = projectexplorer qtsupport qmakeprojectmanager QTC_PLUGIN_DEPENDS = projectexplorer qtsupport qmakeprojectmanager
QT = core gui QT = core gui
CONFIG += console
CONFIG -= app_bundle
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
include(../../rpath.pri)
TARGET = buildoutputparser
win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER
DESTDIR = $$IDE_BIN_PATH
target.path = $$QTC_PREFIX/bin
INSTALLS += target
SOURCES = \ SOURCES = \
main.cpp \ main.cpp \
outputprocessor.cpp outputprocessor.cpp

View File

@@ -1,15 +1,9 @@
include(../../shared/registryaccess/registryaccess.pri) include(../../shared/registryaccess/registryaccess.pri)
include(../../qtcreatortool.pri)
QT += widgets QT += widgets
TARGET = qtcdebugger TARGET = qtcdebugger
TEMPLATE = app
SOURCES += main.cpp 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.input = $$PWD/../../app/app_version.h.in
app_info.output = $$OUT_PWD/app_version.h app_info.output = $$OUT_PWD/app_version.h
QMAKE_SUBSTITUTES += app_info QMAKE_SUBSTITUTES += app_info

View File

@@ -1,10 +1,6 @@
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
TARGET = qtcreator_crash_handler TARGET = qtcreator_crash_handler
DESTDIR = $$IDE_LIBEXEC_PATH
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += \ SOURCES += \
main.cpp \ main.cpp \
@@ -32,6 +28,3 @@ HEADERS += \
FORMS += \ FORMS += \
crashhandlerdialog.ui crashhandlerdialog.ui
target.path = $$QTC_PREFIX/bin
INSTALLS += target

View File

@@ -1,15 +1,9 @@
QT -= gui QT -= gui
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
TEMPLATE = app
TARGET = qtpromaker TARGET = qtpromaker
DESTDIR = $$IDE_LIBEXEC_PATH
CONFIG += console warn_on CONFIG += warn_on
CONFIG -= app_bundle
SOURCES += main.cpp SOURCES += main.cpp
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target

View File

@@ -1,11 +1,7 @@
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
utils utils
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
include(../../rpath.pri)
CONFIG += console
CONFIG -= app_bundle
QT -= gui test QT -= gui test
@@ -50,9 +46,5 @@ HEADERS += \
rmtoolchainoperation.h \ rmtoolchainoperation.h \
settings.h \ settings.h \
DESTDIR=$$IDE_LIBEXEC_PATH
macx:DEFINES += "DATA_PATH=\"\\\".\\\"\"" macx:DEFINES += "DATA_PATH=\"\\\".\\\"\""
else:DEFINES += "DATA_PATH=\"\\\"../share/qtcreator\\\"\"" else:DEFINES += "DATA_PATH=\"\\\"../share/qtcreator\\\"\""
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target

View File

@@ -1,7 +1,7 @@
CONFIG += warn_on console use_c_linker static CONFIG += warn_on use_c_linker static
CONFIG -= qt app_bundle CONFIG -= qt
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
# Switch to statically linked CRT. Note: There will be only one # Switch to statically linked CRT. Note: There will be only one
# global state of the CRT, reconsider if other DLLs are required! # global state of the CRT, reconsider if other DLLs are required!
@@ -18,9 +18,6 @@ win32-msvc* {
SOURCES = wininterrupt.c SOURCES = wininterrupt.c
TEMPLATE = app
DESTDIR = $$IDE_LIBEXEC_PATH
build_all:!build_pass { build_all:!build_pass {
CONFIG -= build_all CONFIG -= build_all
CONFIG += release CONFIG += release
@@ -35,6 +32,3 @@ contains(ENV_CPU, ^AMD64$) {
} else { } else {
TARGET = win32interrupt TARGET = win32interrupt
} }
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target

View File

@@ -1,10 +1,8 @@
CONFIG += warn_on console CONFIG += warn_on
CONFIG -= qt app_bundle CONFIG -= qt
include(../../../qtcreator.pri) include(../../qtcreatortool.pri)
TEMPLATE = app
DESTDIR = $$IDE_LIBEXEC_PATH
SOURCES = winrtdebughelper.cpp SOURCES = winrtdebughelper.cpp
build_all:!build_pass { build_all:!build_pass {
@@ -13,5 +11,3 @@ build_all:!build_pass {
} }
TARGET = winrtdebughelper TARGET = winrtdebughelper
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target