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

6
src/plugins/texteditor/tooltip/tooltip.cpp
View File

@@ -107,7 +107,7 @@ bool ToolTip::acceptShow(const TipContent &content,
}
hideTipImmediately();
}
#if !defined(QT_NO_EFFECTS) && !defined(Q_WS_MAC)
#if !defined(QT_NO_EFFECTS) && !defined(Q_OS_MAC)
// While the effect takes places it might be that although the widget is actually on
// screen the isVisible method doesn't return true.
else if (m_tip
@@ -168,7 +168,7 @@ bool ToolTip::isVisible() const
void ToolTip::showTip()
{
#if !defined(QT_NO_EFFECTS) && !defined(Q_WS_MAC)
#if !defined(QT_NO_EFFECTS) && !defined(Q_OS_MAC)
if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
qFadeEffect(m_tip);
else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))
@@ -237,7 +237,7 @@ bool ToolTip::eventFilter(QObject *o, QEvent *event)
return false;
switch (event->type()) {
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
case QEvent::KeyPress:
case QEvent::KeyRelease: {
int key = static_cast<QKeyEvent *>(event)->key();