This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/examples/gui/rasterwindow/rasterwindow.cpp w/examples/gui/rasterwindow/rasterwindow.cpp | |
index 185ea767343..c190b899764 100644 | |
--- i/examples/gui/rasterwindow/rasterwindow.cpp | |
+++ w/examples/gui/rasterwindow/rasterwindow.cpp | |
@@ -9,6 +9,14 @@ RasterWindow::RasterWindow(QWindow *parent) | |
, m_backingStore(new QBackingStore(this)) | |
{ | |
setGeometry(100, 100, 300, 200); | |
+ | |
+ auto keyEnum = QMetaEnum::fromType<Qt::Key>(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp w/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | |
index ca29576dde2..d696c4e353d 100644 | |
--- i/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | |
+++ w/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | |
@@ -1,6 +1,8 @@ | |
// Copyright (C) 2016 The Qt Company Ltd. | |
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 | |
+#include "tst_qmimedatabase.h" | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/bin/cmds/app/run.js w/bin/cmds/app/run.js | |
index 59d9a37..93fc762 100644 | |
--- i/bin/cmds/app/run.js | |
+++ w/bin/cmds/app/run.js | |
@@ -29,6 +29,12 @@ exports.builder = yargs => { | |
type: 'string', | |
default: '', | |
desc: 'Provide a comma-separated path to local Node.js modules to link. Only works when running the app inside Docker.', | |
+ }) | |
+ .option('network', { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/plugins/platforms/android/qandroidplatformbackingstore.cpp w/src/plugins/platforms/android/qandroidplatformbackingstore.cpp | |
index 33c422bb1ec..09cc9ce8c6b 100644 | |
--- i/src/plugins/platforms/android/qandroidplatformbackingstore.cpp | |
+++ w/src/plugins/platforms/android/qandroidplatformbackingstore.cpp | |
@@ -25,10 +25,11 @@ void QAndroidPlatformBackingStore::flush(QWindow *window, const QRegion ®ion, | |
{ | |
Q_UNUSED(offset); | |
- if (!m_backingStoreSet) | |
+ auto *platformWindow = static_cast<QAndroidPlatformWindow *>(window->handle()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/gui/image/qiconloader.cpp w/src/gui/image/qiconloader.cpp | |
index 92bb5e65db0..312a0efa0df 100644 | |
--- i/src/gui/image/qiconloader.cpp | |
+++ w/src/gui/image/qiconloader.cpp | |
@@ -377,16 +377,14 @@ QIconTheme::QIconTheme(const QString &themeName) | |
m_parents = indexReader.value("Icon Theme/Inherits"_L1).toStringList(); | |
m_parents.removeAll(QString()); | |
- // Ensure a default platform fallback for all themes | |
- if (m_parents.isEmpty()) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/assets/icons/CMakeLists.txt w/src/assets/icons/CMakeLists.txt | |
index df770b0e59e..047e77a8e9e 100644 | |
--- i/src/assets/icons/CMakeLists.txt | |
+++ w/src/assets/icons/CMakeLists.txt | |
@@ -3,8 +3,9 @@ | |
qt_internal_add_module(ExampleIconsPrivate | |
CONFIG_MODULE_NAME example_icons | |
- STATIC | |
+ OBJECT_LIBRARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/plugins/platforms/cocoa/qcocoawindow.mm w/src/plugins/platforms/cocoa/qcocoawindow.mm | |
index cb813114ef8..be2efdae110 100644 | |
--- i/src/plugins/platforms/cocoa/qcocoawindow.mm | |
+++ w/src/plugins/platforms/cocoa/qcocoawindow.mm | |
@@ -134,16 +134,18 @@ void QCocoaWindow::initialize() | |
if (!m_view) | |
m_view = [[QNSView alloc] initWithCocoaWindow:this]; | |
- // Compute the initial geometry based on the geometry set on the | |
- // QWindow. This geometry has already been reflected to the |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <stdlib.h> | |
#include <stdio.h> | |
#include <langinfo.h> | |
#include <CoreFoundation/CoreFoundation.h> | |
#include <Carbon/Carbon.h> | |
void printenv(const char *name, const char *explanation = nullptr) | |
{ | |
printf("%s=%s", name, getenv(name)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/qt_dynamic/gui_manual/CMakeLists.txt w/qt_dynamic/gui_manual/CMakeLists.txt | |
index 737d222..73456aa 100644 | |
--- i/qt_dynamic/gui_manual/CMakeLists.txt | |
+++ w/qt_dynamic/gui_manual/CMakeLists.txt | |
@@ -10,6 +10,7 @@ include_directories("${QT_BUILD_PATH}/include") | |
include_directories("${QT_BUILD_PATH}/include/QtCore") | |
include_directories("${QT_BUILD_PATH}/include/QtGui") | |
link_directories("${QT_BUILD_PATH}/lib") | |
+link_directories("${QT_BUILD_PATH}/plugins/platforms") | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 875e476c6ddaf6b949b69e18d8a16b870966f7a0 | |
Merge: 8a1785a5594 3c2667af24f | |
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io> | |
Date: Mon May 23 13:54:13 2022 +0200 | |
WIP on dev: 8a1785a5594 Darwin: Use Core Foundation event dispatcher for non-GUI main threads | |
diff --cc src/corelib/kernel/qeventdispatcher_cf.mm | |
index 078acbfb09c,078acbfb09c..5404f9bb640 | |
--- a/src/corelib/kernel/qeventdispatcher_cf.mm |