From fee6af7cc3a8a64fb5d3dbf5e2aaf73a6052ccf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Fri, 4 Jun 2010 21:33:23 +0200 Subject: Don't put icons on windows on OS X. diff --git a/Swift/QtUI/QtAboutWidget.cpp b/Swift/QtUI/QtAboutWidget.cpp index c216d55..e9e6329 100644 --- a/Swift/QtUI/QtAboutWidget.cpp +++ b/Swift/QtUI/QtAboutWidget.cpp @@ -21,7 +21,9 @@ namespace Swift { QtAboutWidget::QtAboutWidget() : QDialog() { +#ifndef Q_WS_MAC setWindowTitle("About Swift"); +#endif setWindowIcon(QIcon(":/logo-icon-16.png")); resize(180, 240); diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp index 6d1a8a8..dd63c8d 100644 --- a/Swift/QtUI/QtChatTabs.cpp +++ b/Swift/QtUI/QtChatTabs.cpp @@ -18,7 +18,9 @@ namespace Swift { QtChatTabs::QtChatTabs() : QWidget() { +#ifndef Q_WS_MAC setWindowIcon(QIcon(":/logo-chat-16.png")); +#endif tabs_ = new QtTabWidget(this); #if QT_VERSION >= 0x040500 diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index 982a912..a18b161 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -36,7 +36,9 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() { uiEventStream_ = uiEventStream; setWindowTitle("Swift"); +#ifndef Q_WS_MAC setWindowIcon(QIcon(":/logo-icon-16.png")); +#endif QtUtilities::setX11Resource(this, "Main"); resize(200, 500); -- cgit v0.10.2-6-g49f6