Cory Fields
9 years ago
6 changed files with 103 additions and 118 deletions
@ -0,0 +1,44 @@
@@ -0,0 +1,44 @@
|
||||
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:40:20.956781548 -0400
|
||||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:29:32.052772416 -0400
|
||||
@@ -69,7 +69,7 @@
|
||||
#include <stdlib.h> |
||||
#include <stdio.h> |
||||
#include <windowsx.h> |
||||
-#ifndef Q_OS_WINCE
|
||||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
|
||||
# include <comdef.h> |
||||
#endif |
||||
|
||||
@@ -762,7 +762,7 @@
|
||||
HWND_MESSAGE, NULL, (HINSTANCE)GetModuleHandle(0), NULL); |
||||
} |
||||
|
||||
-#ifndef Q_OS_WINCE
|
||||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
|
||||
// Re-engineered from the inline function _com_error::ErrorMessage(). |
||||
// We cannot use it directly since it uses swprintf_s(), which is not |
||||
// present in the MSVCRT.DLL found on Windows XP (QTBUG-35617). |
||||
@@ -781,7 +781,7 @@
|
||||
return QStringLiteral("IDispatch error #") + QString::number(wCode); |
||||
return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16); |
||||
} |
||||
-#endif // !Q_OS_WINCE
|
||||
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
|
||||
|
||||
/*! |
||||
\brief Common COM error strings. |
||||
@@ -846,12 +846,12 @@
|
||||
default: |
||||
break; |
||||
} |
||||
-#ifndef Q_OS_WINCE
|
||||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
|
||||
_com_error error(hr); |
||||
result += QByteArrayLiteral(" ("); |
||||
result += errorMessageFromComError(error); |
||||
result += ')'; |
||||
-#endif // !Q_OS_WINCE
|
||||
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
|
||||
return result; |
||||
} |
||||
|
||||
@ -1,20 +0,0 @@
@@ -1,20 +0,0 @@
|
||||
--- old/qtbase/src/widgets/kernel/qwidgetwindow.cpp 2014-09-05 20:45:18.717570370 -0400
|
||||
+++ new/qtbase/src/widgets/kernel/qwidgetwindow.cpp 2014-09-05 20:52:38.653576561 -0400
|
||||
@@ -57,7 +57,7 @@
|
||||
Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets(); |
||||
|
||||
QWidget *qt_button_down = 0; // widget got last button-down |
||||
-static QWidget *qt_tablet_target = 0;
|
||||
+static QPointer<QWidget> qt_tablet_target = 0;
|
||||
|
||||
// popup control |
||||
QWidget *qt_popup_down = 0; // popup that contains the pressed widget |
||||
@@ -96,8 +96,6 @@
|
||||
|
||||
QWidgetWindow::~QWidgetWindow() |
||||
{ |
||||
- if (m_widget == qt_tablet_target)
|
||||
- qt_tablet_target = 0;
|
||||
} |
||||
|
||||
#ifndef QT_NO_ACCESSIBILITY |
||||
@ -1,52 +0,0 @@
@@ -1,52 +0,0 @@
|
||||
The following patch was taken from upstream: |
||||
https://qt.gitorious.org/qt/qtbase/commit/70e4428b6f1c6a4bad112203f67ee7d22107616c.patch |
||||
|
||||
The first hunk was removed because it conflicts with 5.2.1, and is not currently needed. |
||||
|
||||
From 70e4428b6f1c6a4bad112203f67ee7d22107616c Mon Sep 17 00:00:00 2001 |
||||
From: Gabriel de Dietrich <gabriel.dedietrich@digia.com> |
||||
Date: Tue, 3 Jun 2014 14:20:20 +0200 |
||||
Subject: [PATCH] Cocoa: Adapt to Xcode 6 clang version sudden pickiness |
||||
MIME-Version: 1.0 |
||||
Content-Type: text/plain; charset=UTF-8 |
||||
Content-Transfer-Encoding: 8bit |
||||
|
||||
Yes, that means OS X Yosemite fix. |
||||
|
||||
Change-Id: I236f7af7b803de24ff0895e04c9a9253b5cfdb3b |
||||
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> |
||||
---
|
||||
.../platforms/cocoa/qcocoaaccessibilityelement.mm | 2 +- |
||||
.../platforms/cocoa/qcocoaapplicationdelegate.mm | 2 +- |
||||
src/plugins/platforms/cocoa/qcocoamenuloader.mm | 2 +- |
||||
3 files changed, 3 insertions(+), 3 deletions(-) |
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
index f841184..548c6a2 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
@@ -124,7 +124,7 @@ static void cleanupCocoaApplicationDelegate()
|
||||
[dockMenu release]; |
||||
[qtMenuLoader release]; |
||||
if (reflectionDelegate) { |
||||
- [NSApp setDelegate:reflectionDelegate];
|
||||
+ [[NSApplication sharedApplication] setDelegate:reflectionDelegate];
|
||||
[reflectionDelegate release]; |
||||
} |
||||
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
||||
diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
|
||||
index 60bc3b5..9340e94 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
|
||||
@@ -174,7 +174,7 @@ QT_END_NAMESPACE
|
||||
- (void)removeActionsFromAppMenu |
||||
{ |
||||
for (NSMenuItem *item in [appMenu itemArray]) |
||||
- [item setTag:nil];
|
||||
+ [item setTag:0];
|
||||
} |
||||
|
||||
- (void)dealloc |
||||
--
|
||||
1.7.1 |
||||
|
||||
Loading…
Reference in new issue