kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt4/Qt5 neutral changes:

Browse Source 
+ replace Q_WS_WIN with Q_OS_WIN
+ replace Q_WS_X11 with Q_OS_LINUX
+ replace Q_WS_MACX with Q_OS_MACX
+ set explicit cast to HWND
This commit is contained in:
wmayer
2016-12-12 14:09:21 +01:00
parent a035045f4d
commit a34c441373
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
View File

@@ -393,7 +393,7 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event)
CONTEXT_ITEM("Sketcher_SelectElementsAssociatedWithConstraints","Select Elements","Sketcher_SelectElementsAssociatedWithConstraints",doSelectConstraints,true)
QAction* rename = menu.addAction(tr("Rename"), this, SLOT(renameCurrentItem())
#ifndef Q_WS_MAC // on Mac F2 doesn't seem to trigger an edit signal
#ifndef Q_OS_MAC // on Mac F2 doesn't seem to trigger an edit signal
,QKeySequence(Qt::Key_F2)
#endif
);

2
src/Mod/Spreadsheet/Gui/qtcolorpicker.h
View File

@@ -54,7 +54,7 @@
#include <QtCore/QEvent>
#include <QtGui/QFocusEvent>
#if defined(Q_WS_WIN)
#if defined(Q_OS_WIN)
# if !defined(QT_QTCOLORPICKER_EXPORT) && !defined(QT_QTCOLORPICKER_IMPORT)
# define QT_QTCOLORPICKER_EXPORT
# elif defined(QT_QTCOLORPICKER_IMPORT)