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>
Showing
- share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp 1 addition, 1 deletionshare/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
- share/qtcreator/qml/qmlobserver/main.cpp 4 additions, 4 deletionsshare/qtcreator/qml/qmlobserver/main.cpp
- share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp 2 additions, 2 deletionsshare/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
- share/qtcreator/qml/qmlobserver/qmlruntime.cpp 1 addition, 1 deletionshare/qtcreator/qml/qmlobserver/qmlruntime.cpp
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp 2 additions, 2 deletions.../qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
- share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp 2 additions, 2 deletions...l/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp
- src/libs/qmleditorwidgets/contextpanewidget.cpp 3 additions, 3 deletionssrc/libs/qmleditorwidgets/contextpanewidget.cpp
- src/libs/qmleditorwidgets/customcolordialog.cpp 2 additions, 2 deletionssrc/libs/qmleditorwidgets/customcolordialog.cpp
- src/libs/qtcomponents/styleitem/qstyleitem.cpp 4 additions, 4 deletionssrc/libs/qtcomponents/styleitem/qstyleitem.cpp
- src/libs/utils/detailsbutton.cpp 2 additions, 2 deletionssrc/libs/utils/detailsbutton.cpp
- src/libs/utils/detailswidget.cpp 2 additions, 2 deletionssrc/libs/utils/detailswidget.cpp
- src/libs/utils/navigationtreeview.cpp 2 additions, 2 deletionssrc/libs/utils/navigationtreeview.cpp
- src/libs/utils/navigationtreeview.h 1 addition, 1 deletionsrc/libs/utils/navigationtreeview.h
- src/libs/utils/pathchooser.cpp 1 addition, 1 deletionsrc/libs/utils/pathchooser.cpp
- src/libs/utils/stylehelper.cpp 1 addition, 1 deletionsrc/libs/utils/stylehelper.cpp
- src/plugins/bookmarks/bookmarksplugin.cpp 3 additions, 3 deletionssrc/plugins/bookmarks/bookmarksplugin.cpp
- src/plugins/coreplugin/actionmanager/command.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/actionmanager/command.cpp
- src/plugins/coreplugin/coreconstants.h 1 addition, 1 deletionsrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/editormanager/editormanager.cpp 7 additions, 7 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/editorview.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/editormanager/editorview.cpp
Loading
Please register or sign in to comment