Skip to content

Instantly share code, notes, and snippets.

View torarnv's full-sized avatar

Tor Arne Vestbø torarnv

  • The Qt Company
  • Oslo, Norway
View GitHub Profile
diff --git i/cmake/QtPluginHelpers.cmake w/cmake/QtPluginHelpers.cmake
index 20bde6f310d..9b514eb2ee7 100644
--- i/cmake/QtPluginHelpers.cmake
+++ w/cmake/QtPluginHelpers.cmake
@@ -526,6 +526,7 @@ function(qt_internal_add_darwin_permission_plugin permission)
LIBRARIES
Qt::Core
Qt::CorePrivate
+ ${FWFoundation}
)
diff --git i/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm w/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index b58f58caebb..10bbc464e3d 100644
--- i/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ w/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -303,6 +303,7 @@ public:
bool show(Qt::WindowModality windowModality, QWindow *parent)
{
+ return false;
Q_UNUSED(parent);
diff --git i/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp w/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 2eee4df0724..1f67f5818a5 100644
--- i/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ w/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -12717,15 +12717,15 @@ void tst_QWidget::setParentChangesFocus_data()
for (const bool before : {true, false}) {
const char *tag = before ? "before" : "after";
- QTest::addRow("give dialog parent, %s", tag)
- << Qt::Dialog << false << Qt::Dialog << true << before << "lineEdit";
diff --git i/src/corelib/itemmodels/qabstractitemmodel.cpp w/src/corelib/itemmodels/qabstractitemmodel.cpp
index fcf6e69534..7d60e94c95 100644
--- i/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ w/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -30,9 +30,11 @@ QT_IMPL_METATYPE_EXTERN(QModelIndexList)
QPersistentModelIndexData *QPersistentModelIndexData::create(const QModelIndex &index)
{
Q_ASSERT(index.isValid()); // we will _never_ insert an invalid index in the list
- QPersistentModelIndexData *d = nullptr;
QAbstractItemModel *model = const_cast<QAbstractItemModel *>(index.model());
src/corelib/text/qlocale_win.cpp:26:namespace winrt::impl
src/corelib/text/qlocale_win.cpp:669: result << QString::fromStdString(winrt::to_string(lang));
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:10:namespace winrt::impl
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:103: using namespace winrt::Windows::Networking::Connectivity;
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:106: [this](const winrt::Windows::Foundation::IInspectable sender) {
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:129: using namespace winrt::Windows::Networking::Connectivity;
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:177:using namespace winrt::Windows::Networking::Connectivity;
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp:219: using namespace winrt::Windows::Networking::Connectivity;
src/plugins/networ
diff --git i/src/gui/kernel/qplatformmenu.cpp w/src/gui/kernel/qplatformmenu.cpp
index d629c8b02d3..0ff1144c1cf 100644
--- i/src/gui/kernel/qplatformmenu.cpp
+++ w/src/gui/kernel/qplatformmenu.cpp
@@ -3,12 +3,24 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qplatformmenu.h"
+#include "qplatformmenu_p.h"
diff --git i/src/gui/text/coretext/qcoretextfontdatabase.mm w/src/gui/text/coretext/qcoretextfontdatabase.mm
index e651c57abec..637fdac4186 100644
--- i/src/gui/text/coretext/qcoretextfontdatabase.mm
+++ w/src/gui/text/coretext/qcoretextfontdatabase.mm
@@ -230,6 +230,11 @@ void QCoreTextFontDatabase::populateFamily(const QString &familyName)
void QCoreTextFontDatabase::invalidate()
{
m_hasPopulatedAliases = false;
+
+ // The font database no longer has any references to the system descriptors,
diff --git i/src/tools/moc/moc.cpp w/src/tools/moc/moc.cpp
index 979c986a417..ec3c9cf87a2 100644
--- i/src/tools/moc/moc.cpp
+++ w/src/tools/moc/moc.cpp
@@ -1428,6 +1428,9 @@ void Moc::parsePluginData(ClassDef *def)
} else if (l == "URI") {
next(STRING_LITERAL);
def->pluginData.uri = unquotedLexem();
+ } else if (l == "JSON") {
+ next(STRING_LITERAL);
diff --git i/src/corelib/kernel/qobject.cpp w/src/corelib/kernel/qobject.cpp
index e07631d0015..bea4e34f70c 100644
--- i/src/corelib/kernel/qobject.cpp
+++ w/src/corelib/kernel/qobject.cpp
@@ -2210,8 +2210,9 @@ void QObjectPrivate::setParent_helper(QObject *o)
}
parent = o;
if (parent) {
+ const auto *parentThreadData = parent->d_func()->threadData.loadRelaxed();
// object hierarchies are constrained to a single thread
diff --git c/cmake/QtPublicPluginHelpers.cmake i/cmake/QtPublicPluginHelpers.cmake
index 6dfaead7553..eef324e4e64 100644
--- c/cmake/QtPublicPluginHelpers.cmake
+++ i/cmake/QtPublicPluginHelpers.cmake
@@ -461,8 +461,10 @@ function(__qt_internal_include_plugin_packages target)
list(APPEND "QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${__plugin_type}" "${plugin_target}")
- # Auto-linkage should be set up only for static library builds.
- if(NOT QT6_IS_SHARED_LIBS_BUILD)