summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-02-20 14:24:16 +0100
committercon <qtc-committer@nokia.com>2009-02-20 14:24:16 +0100
commit8e826862d685355370ca9d5fd42e7ded4756f974 (patch)
treef4dec288641df2a4bfdc8cc57fd646d53a54853d
parent2fbbdca92645063ef1892a551c12fc58d0e86d2e (diff)
downloadqt-creator-8e826862d685355370ca9d5fd42e7ded4756f974.tar.gz
Fixes: - Don't override mac app icon via setWindowIcon.
-rw-r--r--src/plugins/coreplugin/mainwindow.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 1c335c0af5..965b562177 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -151,7 +151,9 @@ MainWindow::MainWindow() :
OutputPaneManager::create();
setWindowTitle(tr("Qt Creator"));
+#ifndef Q_OS_MAC
qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
+#endif
QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));