forked from qt-creator/qt-creator
Replace remaining Q_WS_WIN by Q_OS_WIN.
Task-number: QTCREATORBUG-72 Change-Id: I36f532ebd61472cd6e3d8e63decc96613cc7fab4 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
committed by
Eike Ziller
parent
0869a13938
commit
7e33227146
@@ -109,7 +109,7 @@ const char REMOVE_CURRENT_SPLIT[] = "QtCreator.RemoveCurrentSplit";
|
||||
const char REMOVE_ALL_SPLITS[] = "QtCreator.RemoveAllSplits";
|
||||
const char GOTO_OTHER_SPLIT[] = "QtCreator.GotoOtherSplit";
|
||||
const char CLOSE[] = "QtCreator.Close";
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
const char CLOSE_ALTERNATIVE[] = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72
|
||||
#endif
|
||||
const char CLOSEALL[] = "QtCreator.CloseAll";
|
||||
|
||||
@@ -312,7 +312,7 @@ EditorManager::EditorManager(QWidget *parent) :
|
||||
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
|
||||
connect(d->m_closeCurrentEditorAction, SIGNAL(triggered()), this, SLOT(closeEditor()));
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
// workaround for QTCREATORBUG-72
|
||||
QShortcut *sc = new QShortcut(parent);
|
||||
cmd = ActionManager::registerShortcut(sc, Constants::CLOSE_ALTERNATIVE, editManagerContext);
|
||||
|
||||
@@ -2608,7 +2608,7 @@ QPoint BaseTextEditorWidget::toolTipPosition(const QTextCursor &c) const
|
||||
{
|
||||
const QPoint cursorPos = mapToGlobal(cursorRect(c).bottomRight() + QPoint(1,1));
|
||||
return cursorPos + QPoint(d->m_extraArea->width(),
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
-24
|
||||
#else
|
||||
-16
|
||||
|
||||
@@ -67,7 +67,7 @@ ToolTip *ToolTip::instance()
|
||||
void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w, const QRect &rect)
|
||||
{
|
||||
if (acceptShow(content, pos, w, rect)) {
|
||||
#ifndef Q_WS_WIN
|
||||
#ifndef Q_OS_WIN
|
||||
m_tip = m_tipFactory->createTip(content, w);
|
||||
#else
|
||||
m_tip = m_tipFactory->createTip(
|
||||
@@ -205,7 +205,7 @@ void ToolTip::placeTip(const QPoint &pos, QWidget *w)
|
||||
QRect screen = Internal::screenGeometry(pos, w);
|
||||
QPoint p = pos;
|
||||
p += QPoint(2,
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
21
|
||||
#else
|
||||
16
|
||||
|
||||
Reference in New Issue
Block a user