From f71048a5314c93732a8a77460b465709b632ff5e Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 22 Aug 2018 13:02:04 +0200 Subject: Fix crash when combining QOpenGLWidget, QStaticText and Qt Quick Under certain circumstances, if you had a widget with a QOpenGLPaintEngine, and drew QStaticText into this, and then later had Qt Quick access the same cache and try to resize it, we would get a crash because the resize function would have a pointer to the paint engine and try to access its shader manager (which would now be null, since this is outside the begin()/end() phase of the paint engine. The solution is to reset the paint engine pointer to null on the cache once it has been populated and it is no longer needed. [ChangeLog][QtGui][Text] Fixed a possible crash when combining QStaticText, QOpenGLWidget and Qt Quick in the same application. Task-number: QTBUG-70096 Change-Id: I7383ad7456d1a72499cfcd2da09a5a808d4b3eff Reviewed-by: Simon Hausmann --- src/gui/opengl/qopenglpaintengine.cpp | 1 + src/gui/opengl/qopengltextureglyphcache_p.h | 5 ++ .../widgets/qopenglwidget/tst_qopenglwidget.cpp | 54 ++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 3d1c362275..6a89089f18 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1741,6 +1741,7 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly // we may have to re-bind brush textures after filling in the cache. brushTextureDirty = (QT_BRUSH_TEXTURE_UNIT == glypchCacheTextureUnit); } + cache->setPaintEnginePrivate(nullptr); } if (cache->width() == 0 || cache->height() == 0) diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h index 0b7b5f6082..598cb00ee5 100644 --- a/src/gui/opengl/qopengltextureglyphcache_p.h +++ b/src/gui/opengl/qopengltextureglyphcache_p.h @@ -152,6 +152,11 @@ public: void clear(); + QOpenGL2PaintEngineExPrivate *paintEnginePrivate() const + { + return pex; + } + private: void setupVertexAttribs(); diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index db125f6644..21c9f41646 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,8 @@ #include #include #include +#include +#include #include class tst_QOpenGLWidget : public QObject @@ -64,6 +67,10 @@ private slots: void stackWidgetOpaqueChildIsVisible(); void offscreen(); void offscreenThenOnscreen(); + +#ifdef QT_BUILD_INTERNAL + void staticTextDanglingPointer(); +#endif }; void tst_QOpenGLWidget::initTestCase() @@ -675,6 +682,53 @@ void tst_QOpenGLWidget::offscreenThenOnscreen() QVERIFY(image.pixel(30, 40) == qRgb(0, 0, 255)); } +class StaticTextPainterWidget : public QOpenGLWidget +{ +public: + StaticTextPainterWidget(QWidget *parent = nullptr) + : QOpenGLWidget(parent) + { + } + + void paintEvent(QPaintEvent *) + { + QPainter p(this); + text.setText(QStringLiteral("test")); + p.drawStaticText(0, 0, text); + + ctx = QOpenGLContext::currentContext(); + } + + QStaticText text; + QOpenGLContext *ctx; +}; + +#ifdef QT_BUILD_INTERNAL +void tst_QOpenGLWidget::staticTextDanglingPointer() +{ + QWidget w; + StaticTextPainterWidget *glw = new StaticTextPainterWidget(&w); + w.resize(640, 480); + glw->resize(320, 200); + w.show(); + + QVERIFY(QTest::qWaitForWindowExposed(&w)); + QStaticTextPrivate *d = QStaticTextPrivate::get(&glw->text); + + QCOMPARE(d->itemCount, 1); + QFontEngine *fe = d->items->fontEngine(); + + for (int i = QFontEngine::Format_None; i <= QFontEngine::Format_ARGB; ++i) { + QOpenGLTextureGlyphCache *cache = + (QOpenGLTextureGlyphCache *) fe->glyphCache(glw->ctx, + QFontEngine::GlyphFormat(i), + QTransform()); + if (cache != nullptr) + QCOMPARE(cache->paintEnginePrivate(), nullptr); + } +} +#endif + QTEST_MAIN(tst_QOpenGLWidget) #include "tst_qopenglwidget.moc" -- cgit v1.2.3 From 9652711a0781a652fbf2319b0c59121c381bf016 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 27 Aug 2018 14:11:39 +0200 Subject: Doc: Remove non-reentrant from QDomDocument::setContent Following QTBUG-40015, QDomDocument::setContent is reentrant. This change updates the documentation accordingly. Fixes: QTBUG-69920 Change-Id: Id09e3541156f52d1a976afd02b410c263d3b3352 Reviewed-by: David Faure --- src/xml/dom/qdom.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 17f87804e9..91796106a2 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6666,8 +6666,6 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt } /*! - \nonreentrant - This function parses the XML document from the byte array \a data and sets it as the content of the document. It tries to detect the encoding of the document as required by the XML -- cgit v1.2.3 From ac5e617596625504f4bd5d8bdb8cabb51b575a87 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 27 Aug 2018 13:03:26 +0200 Subject: Doc: Fix typos in QRectF documentation Add missing 's'. Fixes: QTWEBSITE-823 Change-Id: I1acd3b7ae18982248bf3402fa5943ee95c1efdbe Reviewed-by: Venugopal Shivashankar --- src/corelib/tools/qrect.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 40d6c8b7c3..ad1885e8ce 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() function @@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. For example the left(), setLeft() and moveLeft() functions as an @@ -1335,7 +1335,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() @@ -1418,7 +1418,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. For example: the bottom(), setBottom() and moveBottom() functions: -- cgit v1.2.3 From 2ef53620115037015d44d9629ee1e12da44be715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 18 Jul 2018 23:51:58 +0200 Subject: QMacStyle: Make helper-NSViews layer-backed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prevents the view from triggering display of its superview when being temporarily added, which is both inefficient and causes issues when those dirty-rects are wrong due to the wrong frame position of the added view. The additional drawRect: calls and corresponding expose events resulting from the needsDisplay calls also caused repaint issues in Qt Widgets. QWidgetBackingStore doesn't seem to take the exposed region into account for an expose event, and will try to flush all dirty regions. Some of those may be outside the exposed region, and will be clipped away by the window system, never ending up on the screen, but with Widgets still thinking it has flushed all dirty regions. This is a separate issue, possibly solvable by setting the wantsDefaultClipping property on NSView to NO, but this needs further testing, so applying this commit as workaround makes sense, even if it's just hiding the real bug. Task-number: QTBUG-67998 Task-number: QTBUG-68023 Task-number: QTBUG-69990 Task-number: QTBUG-69740 Task-number: QTBUG-69292 Task-number: QTBUG-69332 Reviewed-by: Timur Pocheptsov (cherry picked from commit 38979332d0a66666ebd178bccd7e7a2b300a7e42) Change-Id: I4ef3fef29f749daa4f3a11fe9186ae77b359f966 Reviewed-by: Simon Hausmann Reviewed-by: Morten Johan Sørvig --- src/plugins/styles/mac/qmacstyle_mac.mm | 36 ++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 45da5fbd84..3405f01046 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -1880,20 +1880,46 @@ NSCell *QMacStylePrivate::cocoaCell(CocoaControl widget) const return cell; } -void QMacStylePrivate::drawNSViewInRect(NSView *view, const QRectF &qtRect, QPainter *p, +void QMacStylePrivate::drawNSViewInRect(NSView *view, const QRectF &rect, QPainter *p, __attribute__((noescape)) DrawRectBlock drawRectBlock) const { QMacCGContext ctx(p); setupNSGraphicsContext(ctx, YES); - const CGRect rect = qtRect.toCGRect(); + // FIXME: The rect that we get in is relative to the widget that we're drawing + // style on behalf of, and doesn't take into account the offset of that widget + // to the widget that owns the backingstore, which we are placing the native + // view into below. This means most of the views are placed in the upper left + // corner of backingStoreNSView, which does not map to where the actual widget + // is, and which may cause problems such as triggering a setNeedsDisplay of the + // backingStoreNSView for the wrong rect. We work around this by making the view + // layer-backed, which prevents triggering display of the backingStoreNSView, but + // but there may be other issues lurking here due to the wrong position. QTBUG-68023 + view.wantsLayer = YES; + + // FIXME: We are also setting the frame of the incoming view a lot at the call + // sites of this function, making it unclear who's actually responsible for + // maintaining the size and position of the view. In theory the call sites + // should ensure the _size_ of the view is correct, and then let this code + // take care of _positioning_ the view at the right place inside backingStoreNSView. + // For now we pass on the rect as is, to prevent any regressions until this + // can be investigated properly. + view.frame = rect.toCGRect(); [backingStoreNSView addSubview:view]; - view.frame = rect; + + // FIXME: Based on the code below, this method isn't drawing an NSView into + // a rect, it's drawing _part of the NSView_, defined by the incoming clip + // or dirty rect, into the current graphics context. We're doing some manual + // translations at the call sites that would indicate that this relationship + // is a bit fuzzy. + const CGRect dirtyRect = rect.toCGRect(); + if (drawRectBlock) - drawRectBlock(ctx, rect); + drawRectBlock(ctx, dirtyRect); else - [view drawRect:rect]; + [view drawRect:dirtyRect]; + [view removeFromSuperviewWithoutNeedingDisplay]; restoreNSGraphicsContext(ctx); -- cgit v1.2.3 From 5b6eb8e247d246a28bdc8ce533c52d7647a44a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 28 Aug 2018 14:42:26 +0200 Subject: Extend C++1z test to include variant APIs we use std::get and std::visit are only available on macOS 10.14, so as long as we're building with a deployment target lower than that, we can't enable C++1z globally unless we special-case use of those functions. Change-Id: Idb5eb5992ea4dd7eab92f5310321720e19ac793e Reviewed-by: Ville Voutilainen Reviewed-by: Simon Hausmann --- configure.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.json b/configure.json index 07514992d1..2dc79137e8 100644 --- a/configure.json +++ b/configure.json @@ -283,7 +283,13 @@ "#else", "# error __cplusplus must be > 201402L (the value for C++14)", "#endif", - "#include // https://bugs.llvm.org//show_bug.cgi?id=33117" + "#include // https://bugs.llvm.org//show_bug.cgi?id=33117", + "#include " + ], + "main": [ + "std::variant v(42);", + "int i = std::get(v);", + "std::visit([](const auto &) { return 1; }, v);" ], "qmake": "CONFIG += c++11 c++14 c++1z" } -- cgit v1.2.3 From 3ed306772eb333fb4d9fa0b0a003c119e848ed58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 31 Aug 2018 11:43:24 +0200 Subject: macOS: Detect changes to the platform SDK and ask the user to deal with it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise the SDK upgrade (or downgrade) may subtly and silently affect the resulting binary, or if it results in build breaks, the user won't know why. We limit it to applications for now, as that's the point where it's most important to catch the SDK upgrade, but technically we should also do this for intermediate libraries. Doing it for everything will likely incur a performance cost, so we skip that for now. Change-Id: I8a0604aad8b1e9fba99848ab8ab031c07fd50dc4 Reviewed-by: Morten Johan Sørvig --- mkspecs/features/mac/default_post.prf | 6 ++++++ mkspecs/features/mac/sdk.mk | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 mkspecs/features/mac/sdk.mk diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index c6eb7c5a2c..adc796f395 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,5 +1,11 @@ load(default_post) +# Detect changes to the platform SDK. Apps only for now +contains(TEMPLATE, .*app):!macx-xcode { + QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) +} + !no_objective_c:CONFIG += objective_c qt { diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk new file mode 100644 index 0000000000..a7c8268da5 --- /dev/null +++ b/mkspecs/features/mac/sdk.mk @@ -0,0 +1,12 @@ +CURRENT_MAC_SDK_VERSION := $(shell /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version) + +ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) + $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) + $(info This requires a fresh build. Please wipe the build directory completely,) + $(info including any .qmake.stash and .qmake.cache files generated by qmake.) + # FIXME: Ideally this should be advertised as just running make distclean, or we + # should even do it automatically by having proper makefile dependencies between + # .qmake.stash and the SDK version, but as qmake doesn't seem to be consistent in + # how it deals with .qmake.stash as a dependency we need to defer that until later. + $(error ^) +endif -- cgit v1.2.3 From 4e4057460a0b27e4a8eff749fb284f61f245982e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 31 Aug 2018 12:33:08 +0200 Subject: macOS: Warn the user when using incompatible or untested platform SDKs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-70263 Change-Id: Ic946d1efc69ebb8ba65bbba956ed55ab7183957e Reviewed-by: Morten Johan Sørvig --- configure.pri | 2 ++ mkspecs/common/macx.conf | 2 ++ mkspecs/features/mac/default_post.prf | 40 +++++++++++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/configure.pri b/configure.pri index 34d7c8cf42..6e7f6b76a4 100644 --- a/configure.pri +++ b/configure.pri @@ -1115,6 +1115,8 @@ defineReplace(qtConfOutputPostProcess_publicPro) { "QT_GCC_MINOR_VERSION = $$QMAKE_GCC_MINOR_VERSION" \ "QT_GCC_PATCH_VERSION = $$QMAKE_GCC_PATCH_VERSION" } + !isEmpty(QMAKE_MAC_SDK_VERSION): \ + output += "QT_MAC_SDK_VERSION = $$QMAKE_MAC_SDK_VERSION" !isEmpty(QMAKE_CLANG_MAJOR_VERSION) { output += \ "QT_CLANG_MAJOR_VERSION = $$QMAKE_CLANG_MAJOR_VERSION" \ diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 4be0eb3c39..8f9eda10d7 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -5,6 +5,8 @@ QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx +QT_MAC_SDK_VERSION_TESTED_WITH = 10.13 + device.sdk = macosx device.target = device device.dir_affix = $${device.sdk} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index adc796f395..353fda41e6 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,41 @@ load(default_post) -# Detect changes to the platform SDK. Apps only for now -contains(TEMPLATE, .*app):!macx-xcode { - QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) +contains(TEMPLATE, .*app) { + !macx-xcode { + # Detect changes to the platform SDK + QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } + + # Detect incompatible SDK versions + + !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION): \ + warning("Qt requires at least version $$QT_MAC_SDK_VERSION of the platform SDK," \ + "you're using $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") + + !isEmpty(QT_MAC_SDK_VERSION_TESTED_WITH) { + # For Qt developers only + !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ + CONFIG += sdk_no_version_check + + !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_TESTED_WITH) { + warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_TESTED_WITH"\ + "of the platform SDK, you're using $${QMAKE_MAC_SDK_VERSION}.") + warning("This is an unsupported configuration. You may experience build issues," \ + "and by using") + warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ + "that Qt has not been prepared for.") + + isEqual(QMAKE_MAC_SDK_VERSION, 10.14): \ + warning("E.g., 10.14 enables dark mode and layer-backed views," \ + "which Qt $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION} does not support.") + + warning("Please downgrade the SDK you use to build your app to version" \ + "$$QT_MAC_SDK_VERSION_TESTED_WITH, or configure") + warning("with CONFIG+=sdk_no_version_check when running qmake" \ + "to silence this warning.") + } + } } !no_objective_c:CONFIG += objective_c -- cgit v1.2.3 From d615fb39d58d61d244a460ee13f11c73431a35e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 17 Aug 2018 09:47:59 +0200 Subject: Make QMacCocoaViewContainer work again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The widget visibility state was set to explicitly hidden, which was preventing it from working correctly when its parent widget was shown. This regression was introduced by commit d7a9e08, which made QWindow::setVisible() call QWidget::setVisible(). QWindow::destroy() calls QWindow::setVisible(false), which means that the destroy() call in setCocoaView() would set the CoocaViewContainer to be explicitly hidden. Clear WA_WState_Hidden to work around this behavior. Task-number: QTBUG-67504 Change-Id: I77438fcd01f165f058eea178c214838bd4f27084 Reviewed-by: Tor Arne Vestbø --- src/widgets/widgets/qmaccocoaviewcontainer_mac.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm index 98ee90deb7..0b64b2a2bb 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm @@ -165,6 +165,11 @@ void QMacCocoaViewContainer::setCocoaView(NSView *view) Q_ASSERT(window->handle()); [oldView release]; + + // The QWindow::destroy()) call above will explicitly hide this widget. + // Clear the hidden state here so it can be implicitly shown again. + setAttribute(Qt::WA_WState_Hidden, false); + } QT_END_NAMESPACE -- cgit v1.2.3 From 4daa6bba7fcafd7868552a134f7a0888c9548554 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 28 Aug 2018 11:37:34 +0300 Subject: Add changes file for Qt 5.11.2 Edited-by: Thiago Macieira Change-Id: Ic7f9fdb79524194bf92d330052d971506f066fc5 Reviewed-by: Kai Koehne Reviewed-by: Thiago Macieira --- dist/changes-5.11.2 | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 dist/changes-5.11.2 diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 new file mode 100644 index 0000000000..5bb61339dd --- /dev/null +++ b/dist/changes-5.11.2 @@ -0,0 +1,129 @@ +Qt 5.11.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.2 Changes * +**************************************************************************** + +**************************************************************************** +* Licensing * +**************************************************************************** + + - [QTBUG-52222] The commercial preview license in the git checkout has + been replaced by the Qt License Agreement 4.0 text. This makes it + explicit that commercial customers of The Qt Company can use the git + version under commercial terms. However, support is (still) only + provided for builds from released branches of Qt. + +**************************************************************************** +* QtCore * +**************************************************************************** + + - QFile: + * [QTBUG-69417] Fixed a regression in QFile::copy() that caused the + original file not to be copied entirely if it was modified outside of + this QFile object between the last time we checked its size and the + copy() call. Note this is not a prevention against race conditions. + * [QTBUG-69148] Fixed a regression that caused QFile::map() to succeed + or produce incorrect results when trying to map a file at an offset + beyond 4 GB on 32-bit Android systems and on some special Linux + configurations. + + - QObject: + * [QTBUG-69744] Fixed a bug in setProperty() that caused a property + change not to take effect if the old value compared equal using + QVariant's equality operator, but the values were not strictly equal. + + - QPluginLoader: + * Fixed an issue that could cause a crash when certain damaged or + corrupt plugin files were scanned. + + - QSortFilterProxyModel: + * [QTBUG-58499][QTBUG-69158] insertRows(row,count,parent) with row == + rowCount will insert at the bottom of the source model rather than + at the row QSortFilterProxyModel::rowCount of the source model. + + - QStorageInfo: + * [QTBUG-60215] Fixed a bug that caused the last entry in the mtab file + to be ignored on Android. + * Fixed a bug on Android that could cause QStorageInfo to skip some + filesystems (if the mount table is a virtual file and contains any + short lines) or crash (if the mount table contains any 3-field lines). + + - QString: + * [QTBUG-63620] Formatting of doubles with single-digit exponent, by + number() or args(), now includes a leading zero in that exponent, + consistently with sprintf(), as it did up to 5.6. + + - QSysInfo: + * Fixed QSysInfo::productType() to properly detect some Linux + distributions that ship with a minimal /etc. + + - QTemporaryFile: + * [QTBUG-69436] Worked around a bug in the GNU C Library versions 2.21 + and earlier (used on Linux) that caused temporary files to be created + with permissions 000. + + - QUrl: + * Fixed a bug that caused URLs whose hostnames contained unassigned or + prohibited Unicode codepoints to report isValid() == true, despite + clearing the hostname. + +**************************************************************************** +* QtGui * +**************************************************************************** + + - QMatrix: + * The qHash() implementation for QMatrix has been changed. + + - QTransform: + * The qHash() implementation for QTransform has been changed. + + - Text: + * [QTBUG-69661] Fixed potential crash when using + QTextOption::ShowLineAndParagraphSeparators. + * [QTBUG-70096] Fixed a possible crash when combining QStaticText, + QOpenGLWidget and Qt Quick in the same application. + +**************************************************************************** +* QtWidgets * +**************************************************************************** + + - QMessageBox: + * [QTBUG-69526] A message box with two buttons, one of which is the "Show + Details..." button, can now be closed by clicking the X button on the + window's title bar. + + - QFileDialog: + * QFileDialog::selectedMimeTypeFilter() now returns the actually + selected name filter. + +**************************************************************************** +* Third-Party Code * +**************************************************************************** + + - [QTBUG-69274] SQLite was updated to version 3.24.0. + - [QTBUG-69271] PCRE2 was updated to version 10.31. + +**************************************************************************** +* plugins * +**************************************************************************** + + - ibus: + * Qt programs in Flatpak environment can now trigger IBus input method. -- cgit v1.2.3 From 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 31 Aug 2018 14:02:51 +0200 Subject: Revert "macOS: Force light theme on macOS 10.14+" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This does not really work: as soon as you build with the 10.14 SDK you opt-in to having updated palette management, which the Qt 5.11 series does not have. This leaves app developers with two ways to opt-out of dark mode: - Build with the 10.13 (or earlier) SDK. - Set NSRequiresAquaSystemAppearance in Info.plist This reverts commit 04671a80db32bd7fce470c50934cf60f2e8ffa70. Change-Id: I5c01b9965da45de914f699526ba0723837f36e1d Reviewed-by: Tor Arne Vestbø Reviewed-by: Gabriel de Dietrich --- src/plugins/platforms/cocoa/qcocoaintegration.mm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 79f7ebda54..55b3805df3 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -70,12 +70,6 @@ #include -#if !QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14) -@interface NSApplication (MojaveForwardDeclarations) -@property (strong) NSAppearance *appearance NS_AVAILABLE_MAC(10_14); -@end -#endif - static void initResources() { Q_INIT_RESOURCE(qcocoaresources); @@ -137,21 +131,6 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) NSApplication *cocoaApplication = [QNSApplication sharedApplication]; qt_redirectNSApplicationSendEvent(); - if (__builtin_available(macOS 10.14, *)) { - // Disable dark appearance, unless the Info.plist or environment requests that it should be enabled - bool plistEnablesDarkAppearance = [[[NSBundle mainBundle] objectForInfoDictionaryKey: - @"NSRequiresAquaSystemAppearance"] boolValue]; - - bool hasEnvironmentRequiresAquaAppearance; - int environmentRequiresAquaAppearance = qEnvironmentVariableIntValue( - "QT_MAC_REQUIRES_AQUA_SYSTEM_APPEARANCE", &hasEnvironmentRequiresAquaAppearance); - bool environmentEnablesDarkAppearance = hasEnvironmentRequiresAquaAppearance - && environmentRequiresAquaAppearance == 0; - - if (!(plistEnablesDarkAppearance || environmentEnablesDarkAppearance)) - NSApp.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua]; - } - if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) { // Applications launched from plain executables (without an app // bundle) are "background" applications that does not take keybaord -- cgit v1.2.3