From 5a7b0e9fcf9407839186876c3dae31957ce35a37 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 22 May 2019 08:53:06 +0200 Subject: [PATCH 1/4] Revert "Work around OpenGL issue in macOS 10.14.4" Fixed in macOS 10.14.5 This reverts commit 4bdfaafc4246771bf1cbc87968287f5af5098362. Task-number: QTCREATORBUG-22215 Change-Id: I33c0965e22d61a9a745ed05dd330f6e938ceb3e1 Reviewed-by: Alessandro Portale (cherry picked from commit 9645687e539bd0ea286fb4136329458c3db3694e) --- src/app/app-Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app-Info.plist b/src/app/app-Info.plist index 2e2614b34a6..5893f062a8a 100644 --- a/src/app/app-Info.plist +++ b/src/app/app-Info.plist @@ -194,6 +194,8 @@ NSPrincipalClass NSApplication + NSSupportsAutomaticGraphicsSwitching + CFBundleDocumentTypes From 0dc533ad670260a7e11ad36ec932c98614f7ca6d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 3 Jun 2019 14:04:30 +0200 Subject: [PATCH 2/4] Fix Windows build build with namespaced Qt For real this time. Amends 8dd8d68bdc. Fixes: QTCREATORBUG-22305 Change-Id: I61133f76b7e39a2b0168f8a6c19721231d443807 Reviewed-by: Christian Stenger --- src/shared/proparser/registry.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/proparser/registry.cpp b/src/shared/proparser/registry.cpp index 960b6f8e580..12c268ae2be 100644 --- a/src/shared/proparser/registry.cpp +++ b/src/shared/proparser/registry.cpp @@ -29,6 +29,8 @@ #include #include "registry_p.h" +QT_BEGIN_NAMESPACE + namespace QMakeInternal { #ifdef Q_OS_WIN32 @@ -156,3 +158,4 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l } // namespace QMakeInternal +QT_END_NAMESPACE From e261f6779f983c589678e2924e4e042a1597a5da Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 4 Apr 2019 15:33:23 +0200 Subject: [PATCH 3/4] Doc: Update guidelines to improve the quality of screenshots in docs Use resolution 1366x768 for taking screen shots and don't resize them. Fixes: QTCREATORBUG-16076 Change-Id: Iecb5eb86586579d7d381824fcbc4b873809952e2 Reviewed-by: Brook Cronin Reviewed-by: hjk --- doc/api/qtcreator-documentation.qdoc | 30 +++++++++------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 28e1b32fdc4..1d54a869128 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -165,18 +165,14 @@ the \QC Manual, observe the guidelines listed in this section when taking screen shots. - To make the images look similar regardless of the operating system they were - taken on, you are asked to adjust their size to 75%. This makes the screen - shots hard to read, but they are provided more as reassurance for users that - they are in the correct place in the UI than as an actual source of - information. To make sure that no important information is lost, always - place example values also in the text. + \note Do not rely on screen shots present reasonable example values to + users, but always place example values also in the text. \list - \li Use the screen resolution of 1024x768 (this is available on all - screens). + \li Use the screen resolution of 1366x768 (available on the most + commonly used screens, as of this writing). - \li Use the aspect ratio of 4:3. + \li Use the aspect ratio of 16:9. \li Open the application in the maximum size on full screen. @@ -185,9 +181,6 @@ \li Include only the part of the screen that you need (you can crop the image also in the screen capture tool). - \li In the screen capture tool, open the screen shot and adjust its size - to 75%. - \li To highlight parts of the screen shot, use the images of numbers that are stored in \c{doc\images\numbers} in the \QC repository. @@ -212,13 +205,8 @@ \c doc\images\numbers directory (or in the \c qtdoc module sources in \c doc\images\numbers). - To use the numbers: - - \list - \li Take a screenshot as described above. - \li After resizing the screenshot, copy-paste the number images on - the screenshot to the places that you want to refer to from text. - \endlist + To use the numbers, copy-paste the number images on the screenshot to the + places that you want to refer to from text. \section2 Optimizing Images @@ -234,8 +222,8 @@ You can use a web service, such as \l{https://tinypng.com}, or an image optimization tool to shrink the images. For example, you can use the Radical - Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on - \macos (much less efficient), or some other tool available on Linux. + Image Optimization Tool (RIOT) or OptiPNG on Windows, ImageOptim on + \macos, or some other tool available on Linux. With ImageOptim, you simply drag and drop the image files to the application. The following section describes the settings to use for RIOT. From 6178e871da150c0791c819ecb85a7ed245867eef Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 4 Jun 2019 18:23:55 +0200 Subject: [PATCH 4/4] SSH: Add missing return statement Change-Id: Ic109b0b5a022ea462532fbf21736ee7124168608 Reviewed-by: hjk --- src/libs/ssh/sshconnection.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 703d20932ca..91d8446db97 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -348,8 +348,10 @@ void SshConnection::doConnectToHost() .arg(sshBinary.toUserOutput())); return; } - if (!d->sharingEnabled) + if (!d->sharingEnabled) { emitConnected(); + return; + } d->masterSocketDir.reset(new QTemporaryDir); if (!d->masterSocketDir->isValid()) { emitError(tr("Cannot establish SSH connection: Failed to create temporary "