feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace Q_WS_MAC with Q_OS_MAC.

Browse Source 
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>
This commit is contained in:
Morten Johan Sorvig
2012-01-25 10:25:05 +01:00
committed by Morten Johan Sørvig
parent 896a7a65e4
commit b0cd54c1ec
58 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/openpagesswitcher.cpp
View File

@@ -56,7 +56,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
// We disable the frame on this list view and use a QFrame around it instead.
// This improves the look with QGTKStyle.
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
setFrameStyle(m_openPagesWidget->frameStyle());
#endif
m_openPagesWidget->setFrameStyle(QFrame::NoFrame);
@@ -127,7 +127,7 @@ bool OpenPagesSwitcher::eventFilter(QObject *object, QEvent *event)
emit setCurrentPage(m_openPagesWidget->currentIndex());
return true;
}
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
const Qt::KeyboardModifier modifier = Qt::AltModifier;
#else
const Qt::KeyboardModifier modifier = Qt::ControlModifier;