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/qmlpuppet | |
| parent | 896a7a65e445fb92b589e3334302fb44308e33e2 (diff) | |
| download | qt-creator-b0cd54c1ec9e30a32483065e6c0fcb53a1888e81.tar.gz | |
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/qmlpuppet')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp | 4 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index 94ac4f44a5..63ec371d83 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -66,11 +66,11 @@ void Qt5NodeInstanceServer::initializeView(const QVector<AddImportContainer> &/* Q_ASSERT(!sgView()); m_sgView = new QSGView; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC sgView()->setAttribute(Qt::WA_DontShowOnScreen, true); #endif sgView()->show(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC sgView()->setAttribute(Qt::WA_DontShowOnScreen, true); #endif sgView()->setUpdatesEnabled(false); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp index 974aa289b9..577dff67c6 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp @@ -78,12 +78,12 @@ void Qt4NodeInstanceServer::initializeView(const QVector<AddImportContainer> &/* Q_ASSERT(!declarativeView()); m_declarativeView = new QDeclarativeView; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC declarativeView()->setAttribute(Qt::WA_DontShowOnScreen, true); #endif declarativeView()->setViewportUpdateMode(QGraphicsView::NoViewportUpdate); declarativeView()->show(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC declarativeView()->setAttribute(Qt::WA_DontShowOnScreen, true); #endif } |