diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-01-25 10:25:05 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2012-01-26 11:06:12 +0100 |
| commit | b0cd54c1ec9e30a32483065e6c0fcb53a1888e81 (patch) | |
| tree | d080ed0bb3435f4eab3d0147ebaaaa4e9e0bfee1 /share/qtcreator/qml/qmlobserver/main.cpp | |
| parent | 896a7a65e445fb92b589e3334302fb44308e33e2 (diff) | |
Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.
This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)
Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlobserver/main.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlobserver/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp index 1770a3fe38..62ca9a2600 100644 --- a/share/qtcreator/qml/qmlobserver/main.cpp +++ b/share/qtcreator/qml/qmlobserver/main.cpp @@ -152,7 +152,7 @@ void usage() qWarning(" -I <directory> ........................... prepend to the module import search path,"); qWarning(" display path if <directory> is empty"); qWarning(" -P <directory> ........................... prepend to the plugin search path"); -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) qWarning(" -no-opengl ............................... don't use a QGLWidget for the viewport"); #else qWarning(" -opengl .................................. use a QGLWidget for the viewport"); @@ -215,7 +215,7 @@ struct ViewerOptions useNativeFileBrowser = false; #endif -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) useGL = true; #endif } @@ -375,7 +375,7 @@ static void parseCommandLineOptions(const QStringList &arguments) } else if (arg == "-translation") { if (lastArg) usage(); opts.translationFile = arguments.at(++i); -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) } else if (arg == "-no-opengl") { opts.useGL = false; #else @@ -530,7 +530,7 @@ int main(int argc, char ** argv) systemMsgOutput = qInstallMsgHandler(myMessageOutput); #endif -#if defined (Q_WS_X11) || defined (Q_WS_MAC) +#if defined (Q_WS_X11) || defined (Q_OS_MAC) //### default to using raster graphics backend for now bool gsSpecified = false; for (int i = 0; i < argc; ++i) { |