diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /dist | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/org.qt-project.qtcreator.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/org.qt-project.qtcreator.desktop b/dist/org.qt-project.qtcreator.desktop index 26c0aa58bb..034721891d 100644 --- a/dist/org.qt-project.qtcreator.desktop +++ b/dist/org.qt-project.qtcreator.desktop @@ -5,6 +5,7 @@ Name=Qt Creator GenericName=C++ IDE for developing Qt applications X-KDE-StartupNotify=true Icon=QtProject-qtcreator +StartupWMClass=qtcreator Terminal=false Categories=Development;IDE;Qt; MimeType= text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource; |