summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/bootstrap/bootstrap.pri65
-rw-r--r--src/tools/bootstrap/bootstrap.pro49
-rw-r--r--src/tools/moc/moc.pro16
-rw-r--r--src/tools/moc/preprocessor.cpp14
-rw-r--r--src/tools/qdbuscpp2xml/qdbuscpp2xml.pro12
-rw-r--r--src/tools/qdbusxml2cpp/qdbusxml2cpp.pro10
-rw-r--r--src/tools/qdoc/qdoc.pro24
-rw-r--r--src/tools/rcc/rcc.pro10
-rw-r--r--src/tools/uic/uic.pro11
9 files changed, 56 insertions, 155 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
deleted file mode 100644
index 2b64b291b9..0000000000
--- a/src/tools/bootstrap/bootstrap.pri
+++ /dev/null
@@ -1,65 +0,0 @@
-CONFIG += console qtinc
-CONFIG -= qt
-!build_pass:contains(QT_CONFIG, build_all):CONFIG += release
-CONFIG -= app_bundle
-CONFIG += exceptions_off
-
-DEFINES += \
- QT_BOOTSTRAPPED \
- QT_LITE_UNICODE \
- QT_NO_CAST_FROM_ASCII \
- QT_NO_CAST_TO_ASCII \
- QT_NO_CODECS \
- QT_NO_DATASTREAM \
- QT_NO_LIBRARY \
- QT_NO_QOBJECT \
- QT_NO_SYSTEMLOCALE \
- QT_NO_THREAD \
- QT_NO_UNICODETABLES \
- QT_NO_USING_NAMESPACE \
- QT_NO_DEPRECATED
-
-INCLUDEPATH += $$QT_BUILD_TREE/include \
- $$QT_BUILD_TREE/include/QtCore \
- $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
- $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore
-DEPENDPATH += $$INCLUDEPATH \
- $$QT_SOURCE_TREE/src/corelib/global \
- $$QT_SOURCE_TREE/src/corelib/kernel \
- $$QT_SOURCE_TREE/src/corelib/tools \
- $$QT_SOURCE_TREE/src/corelib/io \
- $$QT_SOURCE_TREE/src/corelib/codecs
-
-hpux-acc*|hpuxi-acc* {
- LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a
-} else {
- contains(CONFIG, debug_and_release_target) {
- CONFIG(debug, debug|release) {
- QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug
- } else {
- QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/release
- }
- } else {
- QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap
- }
- LIBS += -lbootstrap
-}
-!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
- include($$PWD/../../3rdparty/zlib_dependency.pri)
-}
-win32:LIBS += -luser32 -lole32 -ladvapi32
-
-mac {
- CONFIG -= incremental
- LIBS += -framework CoreServices
-}
-
-# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
-sis_target.target = sis
-sis_target.commands =
-sis_target.depends = first
-QMAKE_EXTRA_TARGETS += sis_target
-freeze_target.target = freeze
-freeze_target.commands =
-freeze_target.depends = first
-QMAKE_EXTRA_TARGETS += freeze_target
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 07c4a10573..e57f4dfb2b 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -1,18 +1,12 @@
option(host_build)
-TEMPLATE = lib
-TARGET = bootstrap
-CONFIG += static
-CONFIG += console qtinc
-CONFIG -= qt
-CONFIG += exceptions_off
-!build_pass:contains(QT_CONFIG, build_all):CONFIG += release
-mac:CONFIG -= app_bundle incremental
+TARGET = QtBootstrap
+QT =
+CONFIG += no_module_headers internal_module
-DEFINES += \
+MODULE_DEFINES = \
QT_BOOTSTRAPPED \
QT_LITE_UNICODE \
- QT_NO_CAST_FROM_ASCII \
QT_NO_CAST_TO_ASCII \
QT_NO_CODECS \
QT_NO_DATASTREAM \
@@ -23,13 +17,27 @@ DEFINES += \
QT_NO_UNICODETABLES \
QT_NO_USING_NAMESPACE \
QT_NO_DEPRECATED \
+ QT_NO_TRANSLATION \
QT_QMAKE_LOCATION=\\\"$$QMAKE_QMAKE\\\"
-INCLUDEPATH += $$QT_BUILD_TREE/include \
- $$QT_BUILD_TREE/include/QtCore \
- $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
- $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore \
- $$QT_BUILD_TREE/src/corelib/global
+DEFINES += \
+ $$MODULE_DEFINES \
+ QT_NO_CAST_FROM_ASCII
+
+MODULE_PRIVATE_INCLUDES = \
+ \$\$QT_MODULE_INCLUDE_BASE \
+ \$\$QT_MODULE_INCLUDE_BASE/QtCore \
+ \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \
+ \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore \
+ \$\$QT_MODULE_INCLUDE_BASE/QtXml \
+ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \
+ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
+
+CONFIG += release
+
+load(qt_module)
+
+INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
DEPENDPATH += $$INCLUDEPATH \
../../corelib/global \
@@ -37,7 +45,9 @@ DEPENDPATH += $$INCLUDEPATH \
../../corelib/tools \
../../corelib/io \
../../corelib/codecs \
- ../../corelib/json
+ ../../corelib/json \
+ ../../xml/dom \
+ ../../xml/sax
SOURCES += \
../../corelib/codecs/qlatincodec.cpp \
@@ -76,6 +86,7 @@ SOURCES += \
../../corelib/tools/qdatetime.cpp \
../../corelib/tools/qhash.cpp \
../../corelib/tools/qlist.cpp \
+ ../../corelib/tools/qlinkedlist.cpp \
../../corelib/tools/qlocale.cpp \
../../corelib/tools/qlocale_tools.cpp \
../../corelib/tools/qmap.cpp \
@@ -96,7 +107,9 @@ SOURCES += \
../../corelib/json/qjsonarray.cpp \
../../corelib/json/qjsonvalue.cpp \
../../corelib/json/qjsonparser.cpp \
- ../../corelib/json/qjsonwriter.cpp
+ ../../corelib/json/qjsonwriter.cpp \
+ ../../xml/dom/qdom.cpp \
+ ../../xml/sax/qxml.cpp
unix:SOURCES += ../../corelib/io/qfilesystemengine_unix.cpp \
../../corelib/io/qfilesystemiterator_unix.cpp \
@@ -119,6 +132,8 @@ macx: {
if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
else:include(../../3rdparty/zlib_dependency.pri)
+win32:LIBS += -luser32 -lole32 -ladvapi32
+
lib.CONFIG = dummy_install
INSTALLS += lib
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index 8b53578e23..3a6fd2a02d 100644
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,19 +1,11 @@
option(host_build)
-TEMPLATE = app
-TARGET = moc
-DEFINES += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
-DESTDIR = ../../../bin
-INCLUDEPATH += $$OUT_PWD/../../corelib/global
-DEPENDPATH += $$OUT_PWD/../../corelib/global
-LIBS =
-OBJECTS_DIR = .
+DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
+
+INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
include(moc.pri)
HEADERS += qdatetime_p.h
SOURCES += main.cpp
-include(../bootstrap/bootstrap.pri)
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index 566be9c039..cb53e665d0 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -567,7 +567,7 @@ void Preprocessor::macroExpandIdentifier(int lineNum, Symbols &preprocessed, Mac
// don't expand macros with arguments for now
if (macro.isFunction) {
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
if (!test(PP_LPAREN)) {
preprocessed += s;
return;
@@ -576,7 +576,7 @@ void Preprocessor::macroExpandIdentifier(int lineNum, Symbols &preprocessed, Mac
while (hasNext()) {
Symbols argument;
// strip leading space
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
int nesting = 0;
bool vararg = macro.isVariadic && (arguments.size() == macro.arguments.size() - 1);
while (hasNext()) {
@@ -1173,7 +1173,7 @@ void Preprocessor::parseDefineArguments(Macro *m)
{
Symbols arguments;
while (hasNext()) {
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
Token t = next();
if (t == PP_RPAREN)
break;
@@ -1182,7 +1182,7 @@ void Preprocessor::parseDefineArguments(Macro *m)
if (l == "...") {
m->isVariadic = true;
arguments += Symbol(symbol().lineNum, PP_IDENTIFIER, "__VA_ARGS__");
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
if (!test(PP_RPAREN))
error("missing ')' in macro argument list");
break;
@@ -1197,7 +1197,7 @@ void Preprocessor::parseDefineArguments(Macro *m)
error("Duplicate macro parameter.");
arguments += symbol();
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
t = next();
if (t == PP_RPAREN)
break;
@@ -1207,7 +1207,7 @@ void Preprocessor::parseDefineArguments(Macro *m)
//GCC extension: #define FOO(x, y...) x(y)
// The last argument was already parsed. Just mark the macro as variadic.
m->isVariadic = true;
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
if (!test(PP_RPAREN))
error("missing ')' in macro argument list");
break;
@@ -1215,7 +1215,7 @@ void Preprocessor::parseDefineArguments(Macro *m)
error("Unexpected character in macro argument list.");
}
m->arguments = arguments;
- while (test(PP_WHITESPACE));
+ while (test(PP_WHITESPACE)) {}
}
void Preprocessor::until(Token t)
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 0fee3efbe4..a17b91dd79 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,11 +1,9 @@
option(host_build)
-TEMPLATE = app
-TARGET = qdbuscpp2xml
-
-DESTDIR = ../../../bin
include(../moc/moc.pri)
+DEFINES += QT_NO_CAST_FROM_ASCII
+
INCLUDEPATH += $$QT_BUILD_TREE/include \
$$QT_BUILD_TREE/include/QtDBus \
$$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
@@ -26,8 +24,4 @@ SOURCES += qdbuscpp2xml.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
-include(../bootstrap/bootstrap.pri)
-
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 1d5c4d2fc3..7c2bb2e22f 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,10 +1,6 @@
option(host_build)
-TEMPLATE = app
-TARGET = qdbusxml2cpp
-DESTDIR = ../../../bin
-
-include(../bootstrap/bootstrap.pri)
+DEFINES += QT_NO_CAST_FROM_ASCII
INCLUDEPATH += $$QT_BUILD_TREE/include \
$$QT_BUILD_TREE/include/QtDBus \
@@ -28,6 +24,4 @@ SOURCES = qdbusxml2cpp.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 0c3521c5d7..b489668059 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -1,23 +1,12 @@
option(host_build)
-TEMPLATE = app
-TARGET = qdoc
-DESTDIR = ../../../bin
DEFINES += QDOC2_COMPAT
-include(../bootstrap/bootstrap.pri)
-DEFINES -= QT_NO_CAST_FROM_ASCII
-DEFINES += QT_NO_TRANSLATION
-
INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
- $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
- $$QT_BUILD_TREE/include/QtXml \
- $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION \
- $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION/QtXml
+ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser
DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
- $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
- $$QT_SOURCE_TREE/src/xml
+ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser
# Increase the stack size on MSVC to 4M to avoid a stack overflow
win32-msvc*:{
@@ -79,9 +68,7 @@ SOURCES += atom.cpp \
tokenizer.cpp \
tree.cpp \
yyindent.cpp \
- ../../corelib/tools/qcryptographichash.cpp \
- ../../xml/dom/qdom.cpp \
- ../../xml/sax/qxml.cpp
+ ../../corelib/tools/qcryptographichash.cpp
### QML/JS Parser ###
@@ -121,7 +108,4 @@ qch-docs.CONFIG += no_check_exist directory
QMAKE_EXTRA_TARGETS += html-docs qch-docs
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro
index b224f98b61..f4ad2f63d7 100644
--- a/src/tools/rcc/rcc.pro
+++ b/src/tools/rcc/rcc.pro
@@ -1,15 +1,9 @@
option(host_build)
-TEMPLATE = app
-TARGET = rcc
-DESTDIR = ../../../bin
-DEFINES += QT_RCC
+DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII
include(rcc.pri)
HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
SOURCES += main.cpp
-include(../bootstrap/bootstrap.pri)
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index d481168ac2..77b8c4ba02 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -1,9 +1,6 @@
option(host_build)
-TEMPLATE = app
-TARGET = uic
-DESTDIR = ../../../bin
-DEFINES += QT_UIC
+DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII
include(uic.pri)
include(cpp/cpp.pri)
@@ -19,8 +16,4 @@ SOURCES += main.cpp \
QMAKE_CXXFLAGS_RELEASE -= -O2
}
-include(../bootstrap/bootstrap.pri)
-
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 23:16:04 +0000