diff options
| author | hjk <qtc-committer@nokia.com> | 2009-02-20 17:31:26 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-02-20 17:31:26 +0100 |
| commit | 0d154af6a12ff1f0aa11129c5f92efebe6837585 (patch) | |
| tree | 4188edd8e1fb456b793b56acca1842a3b284b36e | |
| parent | 0b71e89b24d60ef4be8a5b71de543b97548d441b (diff) | |
| parent | d16093d08962c02fe42c102bc10da52f3406710e (diff) | |
| download | qt-creator-0d154af6a12ff1f0aa11129c5f92efebe6837585.tar.gz | |
Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0
| -rw-r--r-- | src/app/qtcreator.ico | bin | 300318 -> 287934 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_128.png | bin | 8690 -> 7136 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_16.png | bin | 725 -> 681 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_24.png | bin | 1139 -> 1102 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_32.png | bin | 1623 -> 1520 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_48.png | bin | 2773 -> 2368 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/qtcreator_logo_64.png | bin | 3386 -> 3132 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 2 |
8 files changed, 2 insertions, 0 deletions
diff --git a/src/app/qtcreator.ico b/src/app/qtcreator.ico Binary files differindex 4aaeed0873..4bd39ff653 100644 --- a/src/app/qtcreator.ico +++ b/src/app/qtcreator.ico diff --git a/src/plugins/coreplugin/images/qtcreator_logo_128.png b/src/plugins/coreplugin/images/qtcreator_logo_128.png Binary files differindex c3ddf74c74..8b8ff34a74 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_128.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_128.png diff --git a/src/plugins/coreplugin/images/qtcreator_logo_16.png b/src/plugins/coreplugin/images/qtcreator_logo_16.png Binary files differindex 6e48e979b8..d9f511f94c 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_16.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_16.png diff --git a/src/plugins/coreplugin/images/qtcreator_logo_24.png b/src/plugins/coreplugin/images/qtcreator_logo_24.png Binary files differindex 797fc705a9..da7b8fde3e 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_24.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_24.png diff --git a/src/plugins/coreplugin/images/qtcreator_logo_32.png b/src/plugins/coreplugin/images/qtcreator_logo_32.png Binary files differindex 992620b8ae..d2ccdc136f 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_32.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_32.png diff --git a/src/plugins/coreplugin/images/qtcreator_logo_48.png b/src/plugins/coreplugin/images/qtcreator_logo_48.png Binary files differindex 4bedd55219..555a51df1b 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_48.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_48.png diff --git a/src/plugins/coreplugin/images/qtcreator_logo_64.png b/src/plugins/coreplugin/images/qtcreator_logo_64.png Binary files differindex 88a11abf6e..0208f42382 100644 --- a/src/plugins/coreplugin/images/qtcreator_logo_64.png +++ b/src/plugins/coreplugin/images/qtcreator_logo_64.png diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 815b96c2aa..35615776a3 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")); |
