diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-02 07:32:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-02 07:32:57 +0200 |
| commit | ac014e38759286725d671c0f0f8bef02bb0c8b9b (patch) | |
| tree | 766d62e3b2a0926ec9ae0789567b00bfcb00e98f /src/app | |
| parent | 93e725c17cda7ee3b9218a6da9f704464e917711 (diff) | |
| parent | 312ff692b02d6b19f39303591c7dc0156bf46661 (diff) | |
| download | qt-creator-ac014e38759286725d671c0f0f8bef02bb0c8b9b.tar.gz | |
Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
src/plugins/projectexplorer/projectnodes.h
Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 359bb673b5..c7b5aff49c 100644 --- 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); |