diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-05-04 16:14:39 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-05-13 11:59:20 +0000 |
| commit | 6ef8d67413511f07abb4f71593ed6d8567f61ca8 (patch) | |
| tree | c874c31442f1f323eee749084cbb3c3698b1a106 /src/qdbus | |
| parent | 27bced7694a593eca555bf4cc46c084ba9302f2d (diff) | |
| download | qttools-6ef8d67413511f07abb4f71593ed6d8567f61ca8.tar.gz | |
Do not unnecessarily set the window icons on Windows
Applications which have an .ico file in their (MS) resources will
have their icon displayed just fine in the window title, task bar,
task switcher, etc.
These .ico files contain all resolutions which are needed by Windows.
There is no need to re-set that icon from a ".png" file at runtime,
which usually also implies scaling it.
Change-Id: Iee6e141637bd5b8ccb677adae115eb84dd2dafa4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/qdbus')
| -rw-r--r-- | src/qdbus/qdbusviewer/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qdbus/qdbusviewer/main.cpp b/src/qdbus/qdbusviewer/main.cpp index 7dcebcc06..8a720404c 100644 --- a/src/qdbus/qdbusviewer/main.cpp +++ b/src/qdbus/qdbusviewer/main.cpp @@ -45,9 +45,10 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName(QStringLiteral("QDBusViewer")); MainWindow mw; -#ifndef Q_OS_MAC +#if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) app.setWindowIcon(QIcon(QLatin1String(":/qt-project.org/qdbusviewer/images/qdbusviewer.png"))); -#else +#endif +#ifdef Q_OS_OSX mw.setWindowTitle(qApp->translate("QtDBusViewer", "Qt D-Bus Viewer")); #endif |