Merge remote-tracking branch 'origin/4.10' into 4.11

Conflicts: src/plugins/projectexplorer/projectnodes.h Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
2019-10-02 07:32:57 +02:00
parent 93e725c17c 312ff692b0
commit ac014e3875
19 changed files with 85 additions and 38 deletions
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -523,6 +523,8 @@ int main(int argc, char **argv)
        }
    }

+    app.setDesktopFileName("org.qt-project.qtcreator.desktop");
+
    // Make sure we honor the system's proxy settings
    QNetworkProxyFactory::setUseSystemConfiguration(true);