summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-02-21 13:42:31 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-03-18 09:21:38 +0100
commit50ef2ac2f135fda07570aba4f40796df801935bf (patch)
tree79455e1044a807f031e97c5486e6e2d04f39a26e
parentb98a44004d3d531207f5941a96f4af1c18eb42d6 (diff)
Add configure features for remaining qttools
I only need qdoc from qttools, but building the other tools takes up quite a bit of time. qdoc already has a configure feature, so account for the rest of them. Change-Id: I0fc60393a1841229025c42b83d06f01668eb2680 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--configure.json111
-rw-r--r--src/assistant/assistant.pro5
-rw-r--r--src/designer/designer.pro4
-rw-r--r--src/distancefieldgenerator/distancefieldgenerator.pro4
-rw-r--r--src/kmap2qmap/kmap2qmap.pro4
-rw-r--r--src/linguist/linguist.pro4
-rw-r--r--src/macdeployqt/macdeployqt.pro4
-rw-r--r--src/makeqpf/makeqpf.pro4
-rw-r--r--src/pixeltool/pixeltool.pro4
-rw-r--r--src/qdbus/qdbus.pro4
-rw-r--r--src/qev/qev.pro4
-rw-r--r--src/qtattributionsscanner/qtattributionsscanner.pro4
-rw-r--r--src/qtdiag/qtdiag.pro4
-rw-r--r--src/qtpaths/qtpaths.pro4
-rw-r--r--src/qtplugininfo/qtplugininfo.pro4
-rw-r--r--src/windeployqt/windeployqt.pro4
-rw-r--r--src/winrtrunner/winrtrunner.pro4
17 files changed, 176 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index cd111df83..2a7304a38 100644
--- a/configure.json
+++ b/configure.json
@@ -1,5 +1,116 @@
{
+ "module": "tools",
+
"subconfigs": [
"src/qdoc"
+ ],
+ "features": {
+ "assistant": {
+ "label": "Qt Assistant",
+ "purpose": "Qt Assistant is a tool for viewing on-line documentation in Qt help file format.",
+ "output": [ "privateFeature" ]
+ },
+ "designer": {
+ "label": "Qt Designer",
+ "purpose": "Qt Designer is the Qt tool for designing and building graphical user interfaces (GUIs) with Qt Widgets. You can compose and customize your windows or dialogs in a what-you-see-is-what-you-get (WYSIWYG) manner, and test them using different styles and resolutions.",
+ "output": [ "privateFeature" ]
+ },
+ "distancefieldgenerator": {
+ "label": "Qt Distance Field Generator",
+ "purpose": "The Qt Distance Field Generator tool can be used to pregenerate the font cache in order to optimize startup performance.",
+ "output": [ "privateFeature" ]
+ },
+ "kmap2qmap": {
+ "label": "kmap2qmap",
+ "purpose": "kmap2qmap is a tool to generate keymaps for use on Embedded Linux. The source files have to be in standard Linux kmap format that is e.g. understood by the kernel's loadkeys command.",
+ "output": [ "privateFeature" ]
+ },
+ "linguist": {
+ "label": "Qt Linguist",
+ "purpose": "Qt Linguist can be used by translator to translate text in Qt applications.",
+ "output": [ "privateFeature" ]
+ },
+ "macdeployqt": {
+ "label": "Mac Deployment Tool",
+ "purpose": "The Mac deployment tool automates the process of creating a deployable application bundle that contains the Qt libraries as private frameworks.",
+ "condition": "config.darwin",
+ "output": [ "privateFeature" ]
+ },
+ "makeqpf": {
+ "label": "makeqpf",
+ "purpose": "makeqpf is a tool to generate pre-rendered fonts in QPF2 format for use on Embedded Linux.",
+ "output": [ "privateFeature" ]
+ },
+ "pixeltool": {
+ "label": "pixeltool",
+ "purpose": "The Qt Pixel Zooming Tool is a graphical application that magnifies the screen around the mouse pointer so you can look more closely at individual pixels.",
+ "output": [ "privateFeature" ]
+ },
+ "qdbus": {
+ "label": "qdbus",
+ "purpose": "qdbus is a communication interface for Qt-based applications.",
+ "output": [ "privateFeature" ]
+ },
+ "qev": {
+ "label": "qev",
+ "purpose": "qev allows introspection of incoming events for a QWidget, similar to the X11 xev tool.",
+ "output": [ "privateFeature" ]
+ },
+ "qtattributionsscanner": {
+ "label": "Qt Attributions Scanner",
+ "purpose": "Qt Attributions Scanner generates attribution documents for third-party code in Qt.",
+ "output": [ "privateFeature" ]
+ },
+ "qtdiag": {
+ "label": "qtdiag",
+ "purpose": "qtdiag outputs information about the Qt installation it was built with.",
+ "output": [ "privateFeature" ]
+ },
+ "qtpaths": {
+ "label": "qtpaths",
+ "purpose": "qtpaths is a command line client to QStandardPaths.",
+ "output": [ "privateFeature" ]
+ },
+ "qtplugininfo": {
+ "label": "qtplugininfo",
+ "purpose": "qtplugininfo dumps metadata about Qt plugins in JSON format.",
+ "output": [ "privateFeature" ]
+ },
+ "windeployqt": {
+ "label": "Windows deployment tool",
+ "purpose": "The Windows deployment tool is designed to automate the process of creating a deployable folder containing the Qt-related dependencies (libraries, QML imports, plugins, and translations) required to run the application from that folder. It creates a sandbox for Universal Windows Platform (UWP) or an installation tree for Windows desktop applications, which can be easily bundled into an installation package.",
+ "condition": "config.win32 || config.winrt",
+ "output": [ "privateFeature" ]
+ },
+ "winrtrunner": {
+ "label": "WinRT Runner Tool",
+ "purpose": "The WinRT Runner Tool installs, runs, and collects test results for packages made with Qt.",
+ "condition": "config.winrt",
+ "output": [ "privateFeature" ]
+ }
+ },
+ "summary": [
+ {
+ "section": "Qt Tools",
+ "entries": [
+ "assistant",
+ "designer",
+ "distancefieldgenerator",
+ "kmap2qmap",
+ "linguist",
+ "macdeployqt",
+ "makeqpf",
+ "pixeltool",
+ "qdbus",
+ "qev",
+ "qtattributionsscanner",
+ "qtdiag",
+ "qtpaths",
+ "qtplugininfo",
+ "windeployqt",
+ "winrtrunner"
+ ]
+ }
]
}
+
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 1529167c0..d34b5590e 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -1,4 +1,9 @@
requires(qtHaveModule(sql))
+
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(assistant))
+
TEMPLATE = subdirs
SUBDIRS += \
diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index be734fb11..46c488f97 100644
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(designer))
+
TEMPLATE = subdirs
SUBDIRS = src
diff --git a/src/distancefieldgenerator/distancefieldgenerator.pro b/src/distancefieldgenerator/distancefieldgenerator.pro
index c37ca6888..d73f4ddea 100644
--- a/src/distancefieldgenerator/distancefieldgenerator.pro
+++ b/src/distancefieldgenerator/distancefieldgenerator.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(distancefieldgenerator))
+
TARGET = qdistancefieldgenerator
QT += gui widgets gui-private core-private quick-private
diff --git a/src/kmap2qmap/kmap2qmap.pro b/src/kmap2qmap/kmap2qmap.pro
index d08ec6bb4..320c6a290 100644
--- a/src/kmap2qmap/kmap2qmap.pro
+++ b/src/kmap2qmap/kmap2qmap.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(kmap2qmap))
+
QT = core input_support-private
CONFIG += console
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index face6545f..7638c7710 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(linguist))
+
TEMPLATE = subdirs
SUBDIRS = \
lconvert \
diff --git a/src/macdeployqt/macdeployqt.pro b/src/macdeployqt/macdeployqt.pro
index a0d90b640..6d50da2d2 100644
--- a/src/macdeployqt/macdeployqt.pro
+++ b/src/macdeployqt/macdeployqt.pro
@@ -1,2 +1,6 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(macdeployqt))
+
TEMPLATE = subdirs
SUBDIRS = macdeployqt macchangeqt
diff --git a/src/makeqpf/makeqpf.pro b/src/makeqpf/makeqpf.pro
index 5a8abc882..25c7e5939 100644
--- a/src/makeqpf/makeqpf.pro
+++ b/src/makeqpf/makeqpf.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(makeqpf))
+
QT += widgets gui-private core-private
CONFIG += console
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro
index f3d1bf436..113211d41 100644
--- a/src/pixeltool/pixeltool.pro
+++ b/src/pixeltool/pixeltool.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(pixeltool))
+
QT += core-private gui-private widgets
mac {
diff --git a/src/qdbus/qdbus.pro b/src/qdbus/qdbus.pro
index 860c1e11e..5bf16848a 100644
--- a/src/qdbus/qdbus.pro
+++ b/src/qdbus/qdbus.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qdbus))
+
TEMPLATE = subdirs
QT_FOR_CONFIG += xml
qtConfig(dom): SUBDIRS = qdbus
diff --git a/src/qev/qev.pro b/src/qev/qev.pro
index f00826ad1..02801a399 100644
--- a/src/qev/qev.pro
+++ b/src/qev/qev.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qev))
+
QT += widgets
SOURCES += qev.cpp
diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro
index 839af9b08..a6f34ee6f 100644
--- a/src/qtattributionsscanner/qtattributionsscanner.pro
+++ b/src/qtattributionsscanner/qtattributionsscanner.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qtattributionsscanner))
+
option(host_build)
CONFIG += console
diff --git a/src/qtdiag/qtdiag.pro b/src/qtdiag/qtdiag.pro
index b9b3c6e56..311982f9f 100644
--- a/src/qtdiag/qtdiag.pro
+++ b/src/qtdiag/qtdiag.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qtdiag))
+
CONFIG += console
QT += core-private gui-private
diff --git a/src/qtpaths/qtpaths.pro b/src/qtpaths/qtpaths.pro
index f494c8148..690843f38 100644
--- a/src/qtpaths/qtpaths.pro
+++ b/src/qtpaths/qtpaths.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qtpaths))
+
SOURCES = qtpaths.cpp
QT = core
win32:CONFIG += console
diff --git a/src/qtplugininfo/qtplugininfo.pro b/src/qtplugininfo/qtplugininfo.pro
index 98feeb986..98b9a34e8 100644
--- a/src/qtplugininfo/qtplugininfo.pro
+++ b/src/qtplugininfo/qtplugininfo.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qtplugininfo))
+
SOURCES = qtplugininfo.cpp
QT = core
CONFIG += console
diff --git a/src/windeployqt/windeployqt.pro b/src/windeployqt/windeployqt.pro
index cd09c238f..bfb219337 100644
--- a/src/windeployqt/windeployqt.pro
+++ b/src/windeployqt/windeployqt.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(windeployqt))
+
option(host_build)
QT = core-private
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_FOREACH
diff --git a/src/winrtrunner/winrtrunner.pro b/src/winrtrunner/winrtrunner.pro
index 15ab391ce..a797bd023 100644
--- a/src/winrtrunner/winrtrunner.pro
+++ b/src/winrtrunner/winrtrunner.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(winrtrunner))
+
option(host_build)
CONFIG += force_bootstrap