diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2012-09-27 15:40:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 08:00:26 +0200 |
| commit | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (patch) | |
| tree | 3af3bd7dfb650ae8cec9de964ac8035ecad42530 /src/plugins/texteditor | |
| parent | 945fb79e4b54f5e4d55e3c947e6be3cd5f09e7e2 (diff) | |
| download | qt-creator-ed86a7ca5860b7e48fd7de2a63f3983f37667c4b.tar.gz | |
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>
Diffstat (limited to 'src/plugins/texteditor')
| -rw-r--r-- | src/plugins/texteditor/fontsettings.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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 { |