Get rid of some Q_WS_X11.

This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

7 files changed, 3 insertions, 15 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 526ca15477..42d63559f7 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
     setrlimit(RLIMIT_NOFILE, &rl);
 #endif
 
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     // QML is unusable with the xlib backend
     QApplication::setGraphicsSystem("raster");
 #endif
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index afc34b6ea0..d8420a3e05 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -186,7 +186,7 @@ MainWindow::MainWindow() :
     QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
     QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR));
     QString baseName = QApplication::style()->objectName();
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     if (baseName == QLatin1String("windows")) {
         // Sometimes we get the standard windows 95 style as a fallback
         // e.g. if we are running on a KDE4 desktop
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index d6c956250e..7b03136e47 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -691,9 +691,7 @@ void DebuggerToolTipWidget::copy()
 {
     const QString clipboardText = clipboardContents();
     QClipboard *clipboard = QApplication::clipboard();
-#ifdef Q_WS_X11
     clipboard->setText(clipboardText, QClipboard::Selection);
-#endif
     clipboard->setText(clipboardText, QClipboard::Clipboard);
 }
 
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 2d6958f4dd..3a2962ddf4 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -225,9 +225,7 @@ void StackTreeView::copyContentsToClipboard()
         str += QLatin1Char('\n');
     }
     QClipboard *clipboard = QApplication::clipboard();
-#    ifdef Q_WS_X11
     clipboard->setText(str, QClipboard::Selection);
-#    endif
     clipboard->setText(str, QClipboard::Clipboard);
 }
 
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 96d9fc3ece..45cb435b60 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -600,9 +600,7 @@ static QString removeWatchActionText(QString exp)
 static void copyToClipboard(const QString &clipboardText)
 {
     QClipboard *clipboard = QApplication::clipboard();
-#ifdef Q_WS_X11
     clipboard->setText(clipboardText, QClipboard::Selection);
-#endif
     clipboard->setText(clipboardText, QClipboard::Clipboard);
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index 5b88f1551e..33d0d14c97 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -921,9 +921,7 @@ void QmlProfilerEventsMainView::copyTableToClipboard() const
         str += d->textForItem(d->m_model->item(i));
     }
     QClipboard *clipboard = QApplication::clipboard();
-#    ifdef Q_WS_X11
     clipboard->setText(str, QClipboard::Selection);
-#    endif
     clipboard->setText(str, QClipboard::Clipboard);
 }
 
@@ -933,9 +931,7 @@ void QmlProfilerEventsMainView::copyRowToClipboard() const
     str = d->textForItem(d->m_model->itemFromIndex(selectedItem()), false);
 
     QClipboard *clipboard = QApplication::clipboard();
-#    ifdef Q_WS_X11
     clipboard->setText(str, QClipboard::Selection);
-#    endif
     clipboard->setText(str, QClipboard::Clipboard);
 }
 
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 219fab2a8b..ada0f6fcaf 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -55,15 +55,13 @@ static const bool DEFAULT_ANTIALIAS = true;
 #ifdef Q_OS_MAC
     enum { DEFAULT_FONT_SIZE = 12 };
     static const char *DEFAULT_FONT_FAMILY = "Monaco";
-#else
-#ifdef Q_WS_X11
+#elif defined(Q_OS_UNIX)
     enum { DEFAULT_FONT_SIZE = 9 };
     static const char *DEFAULT_FONT_FAMILY = "Monospace";
 #else
     enum { DEFAULT_FONT_SIZE = 10 };
     static const char *DEFAULT_FONT_FAMILY = "Courier";
 #endif
-#endif
 } // anonymous namespace
 
 namespace TextEditor {