summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt43
-rw-r--r--src/tools/bootstrap/CMakeLists.txt43
-rw-r--r--src/tools/bootstrap/bootstrap.pro29
-rw-r--r--src/tools/moc/generator.cpp11
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp5
5 files changed, 64 insertions, 67 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 464a19d32e..64493410ac 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -64,32 +64,32 @@ add_qt_module(Bootstrap
../../corelib/serialization/qtextstream.cpp
../../corelib/serialization/qxmlstream.cpp
../../corelib/serialization/qxmlutils.cpp
+ ../../corelib/text/qbytearray.cpp
+ ../../corelib/text/qbytearraymatcher.cpp
+ ../../corelib/text/qlocale.cpp
+ ../../corelib/text/qlocale_tools.cpp
+ ../../corelib/text/qregexp.cpp
+ ../../corelib/text/qstring.cpp
+ ../../corelib/text/qstring_compat.cpp
+ ../../corelib/text/qstringbuilder.cpp
+ ../../corelib/text/qstringlist.cpp
+ ../../corelib/text/qstringview.cpp
+ ../../corelib/text/qvsnprintf.cpp
../../corelib/time/qdatetime.cpp
../../corelib/tools/qarraydata.cpp
../../corelib/tools/qbitarray.cpp
- ../../corelib/tools/qbytearray.cpp
- ../../corelib/tools/qbytearraymatcher.cpp
../../corelib/tools/qcommandlineoption.cpp
../../corelib/tools/qcommandlineparser.cpp
../../corelib/tools/qcryptographichash.cpp
../../corelib/tools/qhash.cpp
../../corelib/tools/qline.cpp
../../corelib/tools/qlist.cpp
- ../../corelib/tools/qlocale.cpp
- ../../corelib/tools/qlocale_tools.cpp
../../corelib/tools/qmap.cpp
../../corelib/tools/qpoint.cpp
../../corelib/tools/qrect.cpp
- ../../corelib/tools/qregexp.cpp
../../corelib/tools/qringbuffer.cpp
../../corelib/tools/qsize.cpp
- ../../corelib/tools/qstring.cpp
- ../../corelib/tools/qstring_compat.cpp
- ../../corelib/tools/qstringbuilder.cpp
- ../../corelib/tools/qstringlist.cpp
- ../../corelib/tools/qstringview.cpp
../../corelib/tools/qversionnumber.cpp
- ../../corelib/tools/qvsnprintf.cpp
../../xml/dom/qdom.cpp
../../xml/sax/qxml.cpp
DEFINES
@@ -104,7 +104,6 @@ add_qt_module(Bootstrap
)
#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
-# CONFIG = "minimal_syncqt" "internal_module" "force_bootstrap" "gc_binaries"
# INSTALLS = "lib"
# MODULE_CONFIG = "gc_binaries"
# MODULE_INCNAME = "QtCore" "QtXml"
@@ -148,24 +147,25 @@ extend_target(Bootstrap CONDITION WIN32
user32
)
-extend_target(Bootstrap CONDITION APPLE_OSX
+extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
- ../../corelib/io/qfilesystemengine_unix.cpp
- ../../corelib/io/qfilesystemiterator_unix.cpp
- ../../corelib/io/qfsfileengine_unix.cpp
- ../../corelib/io/qstandardpaths_mac.mm
../../corelib/kernel/qcore_foundation.mm
../../corelib/kernel/qcore_mac.cpp
../../corelib/kernel/qcore_mac_objc.mm
../../corelib/kernel/qcoreapplication_mac.cpp
- LIBRARIES
- ${FWCoreServices}
PUBLIC_LIBRARIES
${FWFoundation}
)
-extend_target(Bootstrap CONDITION APPLE_OSX AND APPLE_UIKIT
+extend_target(Bootstrap CONDITION APPLE_OSX
+ SOURCES
+ ../../corelib/io/qstandardpaths_mac.mm
+ LIBRARIES
+ ${FWCoreServices}
+)
+
+extend_target(Bootstrap CONDITION APPLE_UIKIT
LIBRARIES
${FWUIKit}
)
@@ -201,9 +201,6 @@ extend_target(Bootstrap CONDITION NOT cross_compile
ZLIB::ZLIB
)
-#### Keys ignored in scope 12:.:.:bootstrap.pro:else:
-# CONFIG = "no_core_dep"
-
extend_target(Bootstrap CONDITION WIN32 AND mingw
PUBLIC_LIBRARIES
uuid
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 1d25e2e6e4..6659cd140a 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -62,32 +62,32 @@ extend_target(Bootstrap
../../corelib/serialization/qtextstream.cpp
../../corelib/serialization/qxmlstream.cpp
../../corelib/serialization/qxmlutils.cpp
+ ../../corelib/text/qbytearray.cpp
+ ../../corelib/text/qbytearraymatcher.cpp
+ ../../corelib/text/qlocale.cpp
+ ../../corelib/text/qlocale_tools.cpp
+ ../../corelib/text/qregexp.cpp
+ ../../corelib/text/qstring.cpp
+ ../../corelib/text/qstring_compat.cpp
+ ../../corelib/text/qstringbuilder.cpp
+ ../../corelib/text/qstringlist.cpp
+ ../../corelib/text/qstringview.cpp
+ ../../corelib/text/qvsnprintf.cpp
../../corelib/time/qdatetime.cpp
../../corelib/tools/qarraydata.cpp
../../corelib/tools/qbitarray.cpp
- ../../corelib/tools/qbytearray.cpp
- ../../corelib/tools/qbytearraymatcher.cpp
../../corelib/tools/qcommandlineoption.cpp
../../corelib/tools/qcommandlineparser.cpp
../../corelib/tools/qcryptographichash.cpp
../../corelib/tools/qhash.cpp
../../corelib/tools/qline.cpp
../../corelib/tools/qlist.cpp
- ../../corelib/tools/qlocale.cpp
- ../../corelib/tools/qlocale_tools.cpp
../../corelib/tools/qmap.cpp
../../corelib/tools/qpoint.cpp
../../corelib/tools/qrect.cpp
- ../../corelib/tools/qregexp.cpp
../../corelib/tools/qringbuffer.cpp
../../corelib/tools/qsize.cpp
- ../../corelib/tools/qstring.cpp
- ../../corelib/tools/qstring_compat.cpp
- ../../corelib/tools/qstringbuilder.cpp
- ../../corelib/tools/qstringlist.cpp
- ../../corelib/tools/qstringview.cpp
../../corelib/tools/qversionnumber.cpp
- ../../corelib/tools/qvsnprintf.cpp
../../xml/dom/qdom.cpp
../../xml/sax/qxml.cpp
PUBLIC_DEFINES # special case
@@ -109,7 +109,6 @@ extend_target(Bootstrap
)
#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
-# CONFIG = "minimal_syncqt" "internal_module" "force_bootstrap" "gc_binaries"
# INSTALLS = "lib"
# MODULE_CONFIG = "gc_binaries"
# MODULE_INCNAME = "QtCore" "QtXml"
@@ -153,24 +152,25 @@ extend_target(Bootstrap CONDITION WIN32
user32
)
-extend_target(Bootstrap CONDITION APPLE_OSX
+extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
- ../../corelib/io/qfilesystemengine_unix.cpp
- ../../corelib/io/qfilesystemiterator_unix.cpp
- ../../corelib/io/qfsfileengine_unix.cpp
- ../../corelib/io/qstandardpaths_mac.mm
../../corelib/kernel/qcore_foundation.mm
../../corelib/kernel/qcore_mac.cpp
../../corelib/kernel/qcore_mac_objc.mm
../../corelib/kernel/qcoreapplication_mac.cpp
- LIBRARIES
- ${FWCoreServices}
PUBLIC_LIBRARIES
${FWFoundation}
)
-extend_target(Bootstrap CONDITION APPLE_OSX AND APPLE_UIKIT
+extend_target(Bootstrap CONDITION APPLE_OSX
+ SOURCES
+ ../../corelib/io/qstandardpaths_mac.mm
+ LIBRARIES
+ ${FWCoreServices}
+)
+
+extend_target(Bootstrap CONDITION APPLE_UIKIT
LIBRARIES
${FWUIKit}
)
@@ -184,9 +184,6 @@ extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
# extend_target(Bootstrap CONDITION cross_compile [...])
# extend_target(Bootstrap CONDITION NOT cross_compile [...])
-#### Keys ignored in scope 12:.:.:bootstrap.pro:else:
-# CONFIG = "no_core_dep"
-
extend_target(Bootstrap CONDITION WIN32 AND mingw
PUBLIC_LIBRARIES
uuid
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 757460393e..32e36cefa0 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -74,32 +74,32 @@ SOURCES += \
../../corelib/serialization/qtextstream.cpp \
../../corelib/serialization/qxmlutils.cpp \
../../corelib/serialization/qxmlstream.cpp \
+ ../../corelib/text/qbytearray.cpp \
+ ../../corelib/text/qbytearraymatcher.cpp \
+ ../../corelib/text/qlocale.cpp \
+ ../../corelib/text/qlocale_tools.cpp \
+ ../../corelib/text/qregexp.cpp \
+ ../../corelib/text/qstring.cpp \
+ ../../corelib/text/qstringbuilder.cpp \
+ ../../corelib/text/qstring_compat.cpp \
+ ../../corelib/text/qstringlist.cpp \
+ ../../corelib/text/qstringview.cpp \
+ ../../corelib/text/qvsnprintf.cpp \
../../corelib/time/qdatetime.cpp \
- ../../corelib/tools/qbitarray.cpp \
- ../../corelib/tools/qbytearray.cpp \
../../corelib/tools/qarraydata.cpp \
- ../../corelib/tools/qbytearraymatcher.cpp \
+ ../../corelib/tools/qbitarray.cpp \
../../corelib/tools/qcommandlineparser.cpp \
../../corelib/tools/qcommandlineoption.cpp \
../../corelib/tools/qcryptographichash.cpp \
../../corelib/tools/qhash.cpp \
../../corelib/tools/qlist.cpp \
- ../../corelib/tools/qlocale.cpp \
- ../../corelib/tools/qlocale_tools.cpp \
../../corelib/tools/qmap.cpp \
- ../../corelib/tools/qregexp.cpp \
../../corelib/tools/qringbuffer.cpp \
../../corelib/tools/qpoint.cpp \
../../corelib/tools/qrect.cpp \
../../corelib/tools/qsize.cpp \
../../corelib/tools/qline.cpp \
- ../../corelib/tools/qstring.cpp \
- ../../corelib/tools/qstringbuilder.cpp \
- ../../corelib/tools/qstring_compat.cpp \
- ../../corelib/tools/qstringlist.cpp \
- ../../corelib/tools/qstringview.cpp \
../../corelib/tools/qversionnumber.cpp \
- ../../corelib/tools/qvsnprintf.cpp \
../../xml/dom/qdom.cpp \
../../xml/sax/qxml.cpp
@@ -126,10 +126,7 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
mac {
SOURCES += \
../../corelib/kernel/qcoreapplication_mac.cpp \
- ../../corelib/kernel/qcore_mac.cpp \
- ../../corelib/io/qfilesystemengine_unix.cpp \
- ../../corelib/io/qfilesystemiterator_unix.cpp \
- ../../corelib/io/qfsfileengine_unix.cpp
+ ../../corelib/kernel/qcore_mac.cpp
OBJECTIVE_SOURCES += \
../../corelib/global/qoperatingsystemversion_darwin.mm \
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 41d0bbf2a1..6a74e739e6 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -518,10 +518,15 @@ void Generator::generateCode()
}
}
+//
+// Generate meta object link to parent meta objects
+//
+
if (!extraList.isEmpty()) {
- fprintf(out, "static const QMetaObject * const qt_meta_extradata_%s[] = {\n ", qualifiedClassNameIdentifier.constData());
+ fprintf(out, "static const QMetaObject::SuperData qt_meta_extradata_%s[] = {\n",
+ qualifiedClassNameIdentifier.constData());
for (int i = 0; i < extraList.count(); ++i) {
- fprintf(out, " &%s::staticMetaObject,\n", extraList.at(i).constData());
+ fprintf(out, " QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", extraList.at(i).constData());
}
fprintf(out, " nullptr\n};\n\n");
}
@@ -537,7 +542,7 @@ void Generator::generateCode()
if (isQObject)
fprintf(out, " nullptr,\n");
else if (cdef->superclassList.size() && (!cdef->hasQGadget || knownGadgets.contains(purestSuperClass)))
- fprintf(out, " &%s::staticMetaObject,\n", purestSuperClass.constData());
+ fprintf(out, " QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", purestSuperClass.constData());
else
fprintf(out, " nullptr,\n");
fprintf(out, " qt_meta_stringdata_%s.data,\n"
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index d16c859eed..fd5f8c9017 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -547,10 +547,11 @@ void WriteInitialization::acceptUI(DomUI *node)
m_output << m_option.indent << language::endFunctionDefinition("setupUi");
if (!m_mainFormUsedInRetranslateUi && language::language() == Language::Cpp) {
+ // Mark varName as unused to avoid compiler warnings.
m_refreshInitialization += m_indent;
- m_refreshInitialization += QLatin1String("Q_UNUSED(");
+ m_refreshInitialization += QLatin1String("(void)");
m_refreshInitialization += varName ;
- m_refreshInitialization += QLatin1String(");\n");
+ m_refreshInitialization += QLatin1String(";\n");
}
m_output << m_option.indent
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 21:24:07 +0000