Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0
hjk
|
Before Width: | Height: | Size: 293 KiB After Width: | Height: | Size: 281 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 725 B After Width: | Height: | Size: 681 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.1 KiB |
@@ -151,7 +151,9 @@ MainWindow::MainWindow() :
|
|||||||
OutputPaneManager::create();
|
OutputPaneManager::create();
|
||||||
|
|
||||||
setWindowTitle(tr("Qt Creator"));
|
setWindowTitle(tr("Qt Creator"));
|
||||||
|
#ifndef Q_OS_MAC
|
||||||
qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
|
qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
|
||||||
|
#endif
|
||||||
QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
|
QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
|
||||||
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
|
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
|
||||||
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
|
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
|
||||||
|
|||||||