From 35f6adbb6e45a78668326b6debd23edc38aefe41 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Apr 2013 14:49:51 +0200 Subject: make use of qt_app.prf Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by: Joerg Bornemann --- src/assistant/assistant/assistant.pro | 8 +------- src/assistant/qhelpconverter/qhelpconverter.pro | 9 ++------- src/designer/src/designer/designer.pro | 9 ++------- src/kmap2qmap/kmap2qmap.pro | 6 ++---- src/linguist/linguist/linguist.pro | 12 ++++-------- src/macdeployqt/macchangeqt/macchangeqt.pro | 3 ++- src/macdeployqt/macdeployqt/macdeployqt.pro | 6 +----- src/makeqpf/makeqpf.pro | 4 +--- src/pixeltool/pixeltool.pro | 6 +----- src/qconfig/qconfig.pro | 9 +++------ src/qdbus/qdbus/qdbus.pro | 6 +----- src/qdbus/qdbusviewer/qdbusviewer.pro | 10 ++-------- src/qev/qev.pro | 2 ++ src/qtconfig/qtconfig.pro | 12 ++---------- src/qtestlib/wince/cetcpsync/cetcpsync.pro | 11 ++--------- src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro | 3 ++- src/qtestlib/wince/cetest/cetest.pro | 10 ++-------- 17 files changed, 32 insertions(+), 94 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index c054147b8..c8ce999fa 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,13 +1,8 @@ -TEMPLATE = app -LANGUAGE = C++ -TARGET = assistant -DESTDIR = $$QT.help.bins qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { QT += webkitwidgets } else { DEFINES += QT_NO_WEBKIT } -!build_pass:contains(QT_CONFIG, build_all): CONFIG += release QT += widgets network help sql help qtHaveModule(printsupport): QT += printsupport PROJECTNAME = Assistant @@ -109,5 +104,4 @@ mac { contains(SQLPLUGINS, sqlite):QTPLUGIN += qsqlite -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_app) diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro index 8c8adfe24..d60aae7cc 100644 --- a/src/assistant/qhelpconverter/qhelpconverter.pro +++ b/src/assistant/qhelpconverter/qhelpconverter.pro @@ -1,11 +1,4 @@ QT += help widgets -TEMPLATE = app -TARGET = qhelpconverter -DESTDIR = $$QT.help.bins -!build_pass:contains(QT_CONFIG, build_all): CONFIG += release - -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target SOURCES += conversionwizard.cpp \ inputpage.cpp \ @@ -45,3 +38,5 @@ FORMS += inputpage.ui \ outputpage.ui RESOURCES += qhelpconverter.qrc + +load(qt_app) diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 75d6f0826..e61a58fe9 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -1,7 +1,5 @@ -DESTDIR = $$QT.designer.bins QT += core-private widgets xml network designer-private designercomponents qtHaveModule(printsupport): QT += printsupport -!build_pass:contains(QT_CONFIG, build_all): CONFIG += release INCLUDEPATH += \ ../lib/sdk \ @@ -15,8 +13,6 @@ contains(QT_CONFIG, static) { DEFINES += QT_DESIGNER_STATIC } -TARGET = designer - include(../../../shared/fontpanel/fontpanel.pri) include(../../../shared/qttoolbardialog/qttoolbardialog.pri) @@ -76,7 +72,6 @@ mac { QMAKE_BUNDLE_DATA += FILETYPES } -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target - unix:!mac:LIBS += -lm + +load(qt_app) diff --git a/src/kmap2qmap/kmap2qmap.pro b/src/kmap2qmap/kmap2qmap.pro index 366485761..7ccdc2c24 100644 --- a/src/kmap2qmap/kmap2qmap.pro +++ b/src/kmap2qmap/kmap2qmap.pro @@ -1,8 +1,6 @@ - -TEMPLATE = app -DESTDIR = $$QT.designer.bins QT = core platformsupport-private CONFIG += console -CONFIG -= app_bundle SOURCES += main.cpp + +load(qt_app) diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index a19fec09b..de04e514a 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -1,12 +1,7 @@ -TEMPLATE = app -LANGUAGE = C++ -DESTDIR = $$QT.designer.bins - QT += core-private widgets xml uitools-private qtHaveModule(printsupport): QT += printsupport DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII -!build_pass:contains(QT_CONFIG, build_all): CONFIG += release include(../shared/formats.pri) @@ -73,13 +68,12 @@ mac { } PROJECTNAME = Qt \ Linguist -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target -phrasebooks.path = $$[QT_INSTALL_DATA]/phrasebooks +phrasebooks.path = $$[QT_INSTALL_DATA]/phrasebooks # ## will this work on windows? phrasebooks.files = $$PWD/../phrasebooks/* INSTALLS += phrasebooks + FORMS += statistics.ui \ phrasebookbox.ui \ batchtranslation.ui \ @@ -88,3 +82,5 @@ FORMS += statistics.ui \ translationsettings.ui \ finddialog.ui RESOURCES += linguist.qrc + +load(qt_app) diff --git a/src/macdeployqt/macchangeqt/macchangeqt.pro b/src/macdeployqt/macchangeqt/macchangeqt.pro index 735123d67..3d5be8d2c 100644 --- a/src/macdeployqt/macchangeqt/macchangeqt.pro +++ b/src/macdeployqt/macchangeqt/macchangeqt.pro @@ -1,2 +1,3 @@ SOURCES += main.cpp ../shared/shared.cpp -CONFIG -= app_bundle + +load(qt_app) diff --git a/src/macdeployqt/macdeployqt/macdeployqt.pro b/src/macdeployqt/macdeployqt/macdeployqt.pro index 8bca0d254..3d5be8d2c 100644 --- a/src/macdeployqt/macdeployqt/macdeployqt.pro +++ b/src/macdeployqt/macdeployqt/macdeployqt.pro @@ -1,7 +1,3 @@ -DESTDIR = $$QT.designer.bins - SOURCES += main.cpp ../shared/shared.cpp -CONFIG -= app_bundle -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_app) diff --git a/src/makeqpf/makeqpf.pro b/src/makeqpf/makeqpf.pro index 17264b5db..5a8abc882 100644 --- a/src/makeqpf/makeqpf.pro +++ b/src/makeqpf/makeqpf.pro @@ -1,6 +1,5 @@ QT += widgets gui-private core-private CONFIG += console -DESTDIR = $$QT.designer.bins DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 HEADERS += qpf2.h mainwindow.h @@ -9,5 +8,4 @@ DEFINES += QT_NO_FREETYPE FORMS += mainwindow.ui RESOURCES += makeqpf.qrc -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_app) diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro index d6dc6a2a2..5eb448b49 100644 --- a/src/pixeltool/pixeltool.pro +++ b/src/pixeltool/pixeltool.pro @@ -1,8 +1,5 @@ -!build_pass:contains(QT_CONFIG, build_all): CONFIG += release QT += widgets network -DESTDIR = $$QT.designer.bins - mac { QMAKE_INFO_PLIST=Info_mac.plist } @@ -10,5 +7,4 @@ mac { SOURCES += main.cpp qpixeltool.cpp HEADERS += qpixeltool.h -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_app) diff --git a/src/qconfig/qconfig.pro b/src/qconfig/qconfig.pro index 3e9c12053..ad0edd726 100644 --- a/src/qconfig/qconfig.pro +++ b/src/qconfig/qconfig.pro @@ -1,9 +1,6 @@ -TEMPLATE = app QT += widgets -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} + HEADERS = feature.h featuretreemodel.h graphics.h SOURCES = main.cpp feature.cpp featuretreemodel.cpp -TARGET = qconfig + +load(qt_app) diff --git a/src/qdbus/qdbus/qdbus.pro b/src/qdbus/qdbus/qdbus.pro index 1abe3f3f8..10a709e98 100644 --- a/src/qdbus/qdbus/qdbus.pro +++ b/src/qdbus/qdbus/qdbus.pro @@ -1,9 +1,5 @@ SOURCES = qdbus.cpp -DESTDIR = $$QT.designer.bins -TARGET = qdbus QT = core dbus-private xml -CONFIG -= app_bundle win32:CONFIG += console -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_app) diff --git a/src/qdbus/qdbusviewer/qdbusviewer.pro b/src/qdbus/qdbusviewer/qdbusviewer.pro index 2c6476cd7..23c6ba027 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.pro +++ b/src/qdbus/qdbusviewer/qdbusviewer.pro @@ -1,6 +1,3 @@ -TEMPLATE = app -TARGET = qdbusviewer - HEADERS = qdbusviewer.h \ qdbusmodel.h \ propertydialog.h @@ -12,13 +9,8 @@ SOURCES = qdbusviewer.cpp \ RESOURCES += qdbusviewer.qrc -DESTDIR = $$QT.designer.bins - QT += widgets dbus-private xml -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target - mac { ICON = images/qdbusviewer.icns QMAKE_INFO_PLIST = Info_mac.plist @@ -27,3 +19,5 @@ mac { win32 { RC_FILE = qdbusviewer.rc } + +load(qt_app) diff --git a/src/qev/qev.pro b/src/qev/qev.pro index 061a9e625..f00826ad1 100644 --- a/src/qev/qev.pro +++ b/src/qev/qev.pro @@ -1,3 +1,5 @@ QT += widgets SOURCES += qev.cpp + +load(qt_app) diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro index e600594c6..775a6b1dc 100644 --- a/src/qtconfig/qtconfig.pro +++ b/src/qtconfig/qtconfig.pro @@ -1,10 +1,4 @@ -TEMPLATE = app CONFIG += x11 -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} -LANGUAGE = C++ QT += gui-private widgets contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 @@ -20,9 +14,7 @@ FORMS = mainwindow.ui paletteeditoradvanced.ui previewwidget.ui RESOURCES = qtconfig.qrc PROJECTNAME = Qt Configuration -TARGET = qtconfig -DESTDIR = $$QT.designer.bins -target.path=$$[QT_INSTALL_BINS] -INSTALLS += target DBFILE = qtconfig.db + +load(qt_app) diff --git a/src/qtestlib/wince/cetcpsync/cetcpsync.pro b/src/qtestlib/wince/cetcpsync/cetcpsync.pro index 0e3205ccc..ddfb44afa 100644 --- a/src/qtestlib/wince/cetcpsync/cetcpsync.pro +++ b/src/qtestlib/wince/cetcpsync/cetcpsync.pro @@ -1,15 +1,6 @@ -TARGET = cetcpsync -DESTDIR = $$QT.designer.bins CONFIG += console -CONFIG -= app_bundle QT += network QT -= gui -TEMPLATE = app - -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} INCLUDEPATH += ../cetcpsyncserver @@ -20,3 +11,5 @@ SOURCES += main.cpp \ HEADERS += \ remoteconnection.h \ qtcesterconnection.h + +load(qt_app) diff --git a/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro b/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro index f03ebd10f..7d8b346e1 100644 --- a/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro +++ b/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro @@ -1,4 +1,3 @@ -TEMPLATE = app TARGET = cetcpsyncsvr QT -= gui QT += network @@ -14,3 +13,5 @@ SOURCES += \ connectionmanager.cpp \ commands.cpp \ main.cpp + +load(qt_app) diff --git a/src/qtestlib/wince/cetest/cetest.pro b/src/qtestlib/wince/cetest/cetest.pro index a31aa2e7c..e7aa7efe3 100644 --- a/src/qtestlib/wince/cetest/cetest.pro +++ b/src/qtestlib/wince/cetest/cetest.pro @@ -1,11 +1,3 @@ -TEMPLATE = app -TARGET = cetest -DESTDIR = $$QT.designer.bins -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} - CONFIG += console no_batch CONFIG -= qt @@ -48,3 +40,5 @@ isEmpty(QT_CE_RAPI_INC) { include(qmake_include.pri) include(bootstrapped.pri) + +load(qt_app) -- cgit v1.2.1