Last active
December 28, 2015 11:29
-
-
Save nonrational/7493506 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/qt/config.tests/qpa/wayland/wayland.cpp b/src/qt/config.tests/qpa/wayland/wayland.cpp | |
index 029e54e..1d38b9e 100644 | |
--- a/src/qt/config.tests/qpa/wayland/wayland.cpp | |
+++ b/src/qt/config.tests/qpa/wayland/wayland.cpp | |
@@ -38,7 +38,7 @@ | |
** $QT_END_LICENSE$ | |
** | |
****************************************************************************/ | |
-#include <wayland-client.h> | |
+// #include <wayland-client.h> | |
int main(int, char **) | |
{ | |
diff --git a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h | |
index c068234..25c37c6 100644 | |
--- a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h | |
+++ b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h | |
@@ -155,7 +155,7 @@ bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEve | |
void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent); | |
bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event); | |
inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); } | |
-struct ::TabletProximityRec; | |
+struct TabletProximityRec; | |
void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); | |
Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); | |
Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); | |
@@ -187,7 +187,7 @@ void qt_mac_handleNonClientAreaMouseEvent(NSWindow *window, NSEvent *event); | |
inline int flipYCoordinate(int y) | |
{ | |
- return QApplication::desktop()->screenGeometry(0).height() - y; | |
+ return QApplication::desktop()->screenGeometry(0).height() - y; | |
} | |
inline qreal flipYCoordinate(qreal y) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment