From 2dd781df87b98697c815183e4abeb226577230ab Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 12 Sep 2019 08:54:58 +0200 Subject: Windows QPA: Fix missing resize when changing the scale factor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not suppress the resize event caused by the handling of WM_DPICHANGED unless the screen really changed. Fixes: QTBUG-76510 Change-Id: I8b9ae41ad7deb863c1633ec5901bc04304b2165c Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/windows/qwindowswindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 79681fd1fa..519a2daae9 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1897,8 +1897,10 @@ void QWindowsWindow::handleGeometryChange() { const QRect previousGeometry = m_data.geometry; m_data.geometry = geometry_sys(); - if (testFlag(WithinDpiChanged)) - return; // QGuiApplication will send resize + if (testFlag(WithinDpiChanged) + && QWindowsContext::instance()->screenManager().screenForHwnd(m_data.hwnd) != screen()) { + return; // QGuiApplication will send resize when screen actually changes + } QWindowSystemInterface::handleGeometryChange(window(), m_data.geometry); // QTBUG-32121: OpenGL/normal windows (with exception of ANGLE) do not receive // expose events when shrinking, synthesize. -- cgit v1.2.3 From 15e1c159868774b0b3c532a09281d45798b0f5d8 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 16 Sep 2019 17:56:31 +0200 Subject: evdevtouch: Add fallback definition of ABS_MT_PRESSURE; fix alignment Fixes: QTBUG-78298 Change-Id: Ib6acb1fdca551a84aba5dec2f28cf784a212692c Reviewed-by: Laszlo Agocs --- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index b5bd2dcff4..f86f80785e 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Jolla Ltd, author: ** Contact: https://www.qt.io/licensing/ ** @@ -74,7 +74,7 @@ Q_LOGGING_CATEGORY(qLcEvdevTouch, "qt.qpa.input") #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ #endif #ifndef ABS_MT_POSITION_X -#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ +#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ #endif #ifndef ABS_MT_POSITION_Y #define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ @@ -88,6 +88,9 @@ Q_LOGGING_CATEGORY(qLcEvdevTouch, "qt.qpa.input") #ifndef ABS_MT_TRACKING_ID #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ #endif +#ifndef ABS_MT_PRESSURE +#define ABS_MT_PRESSURE 0x3a +#endif #ifndef SYN_MT_REPORT #define SYN_MT_REPORT 2 #endif -- cgit v1.2.3 From 983cfc773d1f24badbdeafd6fbbb2a5940c6f614 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 16 Sep 2019 14:55:57 +0200 Subject: Fix Vulkan SDK detection for MinGW cross-compilation We must not set QMAKE_INCDIR_VULKAN if the Vulkan SDK is installed in some default include directory. MinGW's std headers rely on #include_next, which will break if we mess with the order of default include paths. Fixes: QTBUG-76660 Change-Id: I5ee0fc4c328ff88b979a8c1c010472b3883dff8d Reviewed-by: Kai Koehne --- mkspecs/features/win32/windows_vulkan_sdk.prf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf index 2aebbd3b25..4dc0e50090 100644 --- a/mkspecs/features/win32/windows_vulkan_sdk.prf +++ b/mkspecs/features/win32/windows_vulkan_sdk.prf @@ -3,6 +3,11 @@ isEmpty(QMAKE_INCDIR_VULKAN) { # headers are found out-of-the-box on typical Windows setups. QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include + # Do not add default include paths as that can knock std headers + # out of their stride due to their usage of #include_next. + contains(QMAKE_DEFAULT_INCDIRS, $$QMAKE_INCDIR_VULKAN): \ + QMAKE_INCDIR_VULKAN = + # Do not export the include dir but resolve it on every qmake call. QMAKE_EXPORT_INCDIR_VULKAN = - } -- cgit v1.2.3 From 1456b8091a681316f0e6256554fd138c6399f564 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 12 Sep 2019 10:27:16 +0200 Subject: Make it possible to undefine NDEBUG for nmake and VS projects For nmake and VS projects we added the NDEBUG define for the release configuration unconditionally within the qmake generators. To undefine it, users had to use a nasty work-around. Now, define NDEBUG within the MSVC mkspecs. In order to do that we introduce the DEFINES_RELEASE and DEFINES_DEBUG variables that are merged into DEFINES in default_pre.prf. Users can unset NDEBUG by writing DEFINES -= NDEBUG in their .pro file. Note that DEFINES_RELEASE and DEFINES_DEBUG are merged in default_pre.prf in order to give extra compilers (like moc) the chance to see the fully resolved DEFINES variable. This is different from the QMAKE_CFLAGS_(DEBUG|RELEASE) variables that get merged in default_post.prf. Fixes: QTBUG-78071 Change-Id: I381770a1d2f974fbae9b09a2254e3f2fc7842b68 Reviewed-by: Kai Koehne --- mkspecs/common/msvc-desktop.conf | 1 + mkspecs/common/winrt_winphone/qmake.conf | 1 + mkspecs/features/default_pre.prf | 6 ++++++ qmake/doc/src/qmake-manual.qdoc | 20 ++++++++++++++++++++ qmake/generators/win32/msvc_nmake.cpp | 4 ---- qmake/generators/win32/msvc_objectmodel.cpp | 1 - qmake/generators/win32/msvc_vcproj.cpp | 3 --- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 0b94e5a3f5..034fd3b305 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -19,6 +19,7 @@ CONFIG += flat debug_and_release debug_and_release_target precom # MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without # _ENABLE_EXTENDED_ALIGNED_STORAGE flag since the fix breaks binary compatibility. DEFINES += UNICODE _UNICODE WIN32 _ENABLE_EXTENDED_ALIGNED_STORAGE +DEFINES_RELEASE += NDEBUG QMAKE_COMPILER_DEFINES += _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 03fb96f2c5..e683018a81 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -11,6 +11,7 @@ CONFIG = package_manifest $$CONFIG incremental flat precompile_ # MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without # _ENABLE_EXTENDED_ALIGNED_STORAGE flag since the fix breaks binary compatibility. DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT Q_BYTE_ORDER=Q_LITTLE_ENDIAN _ENABLE_EXTENDED_ALIGNED_STORAGE +DEFINES_RELEASE += NDEBUG QMAKE_COMPILER_DEFINES += _WIN32 DEPLOYMENT_PLUGIN += qwinrt diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 1c24bf071a..b2629d04c0 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -26,4 +26,10 @@ CONFIG = \ unset(today) } +CONFIG(debug, debug|release) { + DEFINES += $$DEFINES_DEBUG +} else { + DEFINES += $$DEFINES_RELEASE +} + load(toolchain) diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 3495f97b2c..a388b89477 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1144,6 +1144,26 @@ \snippet code/doc_src_qmake-manual.pro 27 + \target DEFINES_DEBUG + \section1 DEFINES_DEBUG + + Specifies preprocessor defines for the debug configuration. The values of + this variable get added to \l{DEFINES} before the project is loaded. This + variable is typically set in \l{#QMAKESPEC}{qmake.conf} and rarely needs + to be modified. + + This variable was introduced in Qt 5.13.2. + + \target DEFINES_RELEASE + \section1 DEFINES_RELEASE + + Specifies preprocessor defines for the release configuration. The values of + this variable get added to \l{DEFINES} before the project is loaded. This + variable is typically set in \l{#QMAKESPEC}{qmake.conf} and rarely needs + to be modified. + + This variable was introduced in Qt 5.13.2. + \target DEF_FILE \section1 DEF_FILE diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 63d89a5388..fd90cfcb2a 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -281,10 +281,6 @@ void NmakeMakefileGenerator::init() if (project->isActiveConfig("debug")) { project->values("QMAKE_CLEAN").append(targetBase + ".ilk"); project->values("QMAKE_CLEAN").append(targetBase + ".idb"); - } else { - ProStringList &defines = project->values("DEFINES"); - if (!defines.contains("NDEBUG")) - defines.append("NDEBUG"); } if (project->values("QMAKE_APP_FLAG").isEmpty() && project->isActiveConfig("dll")) { diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 506229a7f4..5fb6bfb320 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2125,7 +2125,6 @@ VCResourceCompilerTool::VCResourceCompilerTool() ShowProgress(linkProgressNotSet), SuppressStartupBanner(unset) { - PreprocessorDefinitions = QStringList("NDEBUG"); } // VCDeploymentTool -------------------------------------------- diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index b6f7f20564..df4876ace7 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1038,9 +1038,6 @@ void VcprojGenerator::initConfiguration() initDeploymentTool(); initWinDeployQtTool(); initPreLinkEventTools(); - - if (!isDebug) - conf.compiler.PreprocessorDefinitions += "NDEBUG"; } void VcprojGenerator::initCompilerTool() -- cgit v1.2.3 From 90779d96adfa51a3fc00b6c0d93168b4bbfcf983 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 16 Sep 2019 13:18:23 +0200 Subject: Ignore non-existent .ui file dependencies Commit 80dea664 broke .ui files with global includes that are not part of the project, because we blindly added every file path that falls out of 'uic -d' as dependency. Introduce the extra compiler CONFIG flag dep_existing_only to bring back the old behavior that ignores non-existent dependencies and set it for uic. Change-Id: I6eaa82817c932a98ebac6d08115a9815d4b9dd21 Fixes: QTBUG-78144 Reviewed-by: Kai Koehne --- mkspecs/features/uic.prf | 2 +- qmake/doc/src/qmake-manual.qdoc | 5 +++++ qmake/generators/makefile.cpp | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 1cedce5ae7..a5df0c7e8d 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -9,7 +9,7 @@ uic.depend_command = $$QMAKE_UIC_DEP -d ${QMAKE_FILE_IN} uic.output = $$UI_DIR/$${QMAKE_MOD_UIC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} uic.input = FORMS uic.variable_out = GENERATED_FILES -uic.CONFIG += no_link target_predeps dep_lines +uic.CONFIG += no_link target_predeps dep_lines dep_existing_only uic.name = UIC ${QMAKE_FILE_IN} silent:uic.commands = @echo uic ${QMAKE_FILE_IN} && $$uic.commands QMAKE_EXTRA_COMPILERS += uic diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index a388b89477..b178084690 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -4815,6 +4815,11 @@ \li explicit_dependencies \li The dependencies for the output only get generated from the depends member and from nowhere else. + \row + \li dep_existing_only + \li Every dependency that is a result of .depend_command is checked for + existence. Non-existing dependencies are ignored. + This value was introduced in Qt 5.13.2. \row \li dep_lines \li The output from the .depend_command is interpreted to be one file diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index a45b676d5f..22ac7bf534 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1992,6 +1992,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) } t << endl; } + const bool existingDepsOnly = config.contains("dep_existing_only"); QStringList tmp_dep = project->values(ProKey(*it + ".depends")).toQStringList(); if (config.indexOf("combine") != -1) { if (tmp_out.contains(QRegExp("(^|[^$])\\$\\{QMAKE_(?!VAR_)"))) { @@ -2033,6 +2034,8 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) warn_msg(WarnDeprecated, ".depend_command for extra compiler %s" " prints paths relative to source directory", (*it).toLatin1().constData()); + else if (existingDepsOnly) + file.clear(); else file = absFile; // fallback for generated resources } else { @@ -2118,6 +2121,8 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) warn_msg(WarnDeprecated, ".depend_command for extra compiler %s" " prints paths relative to source directory", (*it).toLatin1().constData()); + else if (existingDepsOnly) + file.clear(); else file = absFile; // fallback for generated resources } else { -- cgit v1.2.3 From a96c4b3aab4592155f7647399f6f2eda98d3908a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 11 Sep 2019 14:42:30 +0200 Subject: QHighDPI: Fix wrong conversion for native child windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not try to find a screen for native child coordinates. Fixes: QTBUG-78158 Change-Id: I78ba814929f4db3dfd7dd43c09f7c7642222f4fb Reviewed-by: Morten Johan Sørvig --- src/gui/kernel/qhighdpiscaling.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index 64f1397771..8189eebedd 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -476,8 +476,10 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w { if (!m_active) return { qreal(1), QPoint() }; + QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen(); - return scaleAndOrigin(screen, nativePosition); + const bool searchScreen = !window || window->isTopLevel(); + return scaleAndOrigin(screen, searchScreen ? nativePosition : nullptr); } #endif //QT_NO_HIGHDPISCALING -- cgit v1.2.3 From 392931662d92a73a4379e59b077dc48ee43f1e70 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 13 Sep 2019 14:04:25 +0200 Subject: Fix qtConfLibrary_freetype's include paths The variable QMAKE_DEFAULT_INCDIRS was misspelled, which means we never really looked for freetype in the default paths. Change-Id: I20c35a783505678169ecb642927f74b339e55b68 Reviewed-by: Edward Welbourne --- src/gui/configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/configure.pri b/src/gui/configure.pri index 1b95449a10..1c024779b2 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -3,7 +3,7 @@ defineTest(qtConfLibrary_freetype) { TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 haiku: TRY_INCLUDEPATHS += /system/develop/headers - TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIR + TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS for (p, TRY_INCLUDEPATHS) { includedir = $$p/freetype2 exists($$includedir) { -- cgit v1.2.3 From 20d8186c24144de90b75a036ee284c68380d9ff5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 13 Sep 2019 14:20:48 +0200 Subject: Fix passing FREETYPE_LIBS and friends to configure On systems where the pkg-config source fails, configure falls back to a library source of the type 'freetype'. This ignored variables like FREETYPE_LIBS users can pass to configure. The qtConfLibrary_freetype function now diverts to qtConfLibrary_inline which handles all those variables. Change-Id: Icef70deb130ce6d2de1520af4344ccccd677f287 Fixes: QTBUG-77643 Reviewed-by: Edward Welbourne Reviewed-by: Oliver Wolff --- src/gui/configure.pri | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/gui/configure.pri b/src/gui/configure.pri index 1c024779b2..490ef0df28 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -1,18 +1,22 @@ # custom tests defineTest(qtConfLibrary_freetype) { - TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 - haiku: TRY_INCLUDEPATHS += /system/develop/headers - TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS - for (p, TRY_INCLUDEPATHS) { - includedir = $$p/freetype2 - exists($$includedir) { - $${1}.includedir = $$includedir - export($${1}.includedir) - return(true) + input = $$eval($${2}.alias) + isEmpty(config.input.$${input}.incdir) { + TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 + haiku: TRY_INCLUDEPATHS += /system/develop/headers + TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS + for (p, TRY_INCLUDEPATHS) { + includedir = $$p/freetype2 + exists($$includedir) { + config.input.$${input}.incdir = $$includedir + export(config.input.$${input}.incdir) + break() + } } } - return(true) + qtConfLibrary_inline($$1, $$2): return(true) + return(false) } # Check for Direct X shader compiler 'fxc'. -- cgit v1.2.3 From 6c0e1dba403ce65285e089bf281319de36d29235 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 18 Sep 2019 10:18:31 +0200 Subject: QWizard/AeroStyle: Fix crash when Qt::AA_NativeWindows is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prevent recursive platform window creation from the events received during window creation (WM_POSCHANGING, etc). Fixes: QTBUG-78300 Change-Id: Ie2bb4308af645c30e556666589e2dd08f14d4035 Reviewed-by: André de la Rocha --- src/widgets/dialogs/qwizard.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index f6f540f57c..ccbf8491b3 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3267,7 +3267,10 @@ bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *resu if (QVistaHelper::vistaState() != d->vistaState) { d->vistaState = QVistaHelper::vistaState(); d->vistaStateChanged = true; - setWizardStyle(AeroStyle); + // QTBUG-78300: When Qt::AA_NativeWindows is set, delay further + // window creation until after the platform window creation events. + if (windowsMessage->message == WM_GETICON) + setWizardStyle(AeroStyle); } return winEventResult; } else { -- cgit v1.2.3 From cd92049a95e6c762dadf011fad93f5ca151375fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Thu, 5 Sep 2019 12:37:00 +0200 Subject: Prevent crash in QWasmScreen::resizeMaximizedWindows() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit screen() may return a null QScreen pointer during screen initialization. Fixes: QTBUG-78118 Change-Id: Ide26eb3f06861c38cd7ae56789dd010d4cd7e572 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmscreen.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp index f2eabfa486..e536bc0ee3 100644 --- a/src/plugins/platforms/wasm/qwasmscreen.cpp +++ b/src/plugins/platforms/wasm/qwasmscreen.cpp @@ -139,6 +139,8 @@ QPlatformCursor *QWasmScreen::cursor() const void QWasmScreen::resizeMaximizedWindows() { + if (!screen()) + return; QPlatformScreen::resizeMaximizedWindows(); } -- cgit v1.2.3 From 1ceb48c6a6aa7d718a6abfc7390cde387f990ed9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 18 Sep 2019 15:49:07 +0200 Subject: QWizard/AeroStyle: Fix condition introduced by previous fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set the variables within the condition introduced by 6c0e1dba403ce65285e089bf281319de36d29235, as otherwise, the code might not be executed. Task-number: QTBUG-78300 Change-Id: Ia83db6fce197ebf16783f3b0c6d6fad7ebd2ba52 Reviewed-by: André de la Rocha Reviewed-by: Oliver Wolff --- src/widgets/dialogs/qwizard.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index ccbf8491b3..7b26d9a67a 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3265,12 +3265,13 @@ bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *resu MSG *windowsMessage = static_cast(message); const bool winEventResult = d->vistaHelper->handleWinEvent(windowsMessage, result); if (QVistaHelper::vistaState() != d->vistaState) { - d->vistaState = QVistaHelper::vistaState(); - d->vistaStateChanged = true; // QTBUG-78300: When Qt::AA_NativeWindows is set, delay further // window creation until after the platform window creation events. - if (windowsMessage->message == WM_GETICON) + if (windowsMessage->message == WM_GETICON) { + d->vistaStateChanged = true; + d->vistaState = QVistaHelper::vistaState(); setWizardStyle(AeroStyle); + } } return winEventResult; } else { -- cgit v1.2.3 From 0d9f43d534983411e37a9f3912de272a4a6ced64 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 13 Sep 2019 16:18:51 +0200 Subject: Doc: Edit QNetworkProxy::QNetworkProxy() default proxy type Fixes: QTBUG-61771 Change-Id: Ideafe6f8f81c156e941f0548c152021b01b606a1 Reviewed-by: Paul Wicking --- src/network/kernel/qnetworkproxy.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 3646a9526a..febddfd880 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -494,8 +494,10 @@ template<> void QSharedDataPointer::detach() } /*! - Constructs a QNetworkProxy with DefaultProxy type; the proxy type is - determined by applicationProxy(), which defaults to NoProxy. + Constructs a QNetworkProxy with DefaultProxy type. + + The proxy type is determined by applicationProxy(), which defaults to + NoProxy or a system-wide proxy if one is configured. \sa setType(), setApplicationProxy() */ -- cgit v1.2.3