Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f682864
commit a6a8675
Showing
4 changed files
with
141 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000 | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000 | ||
@@ -74,8 +74,6 @@ | ||
|
||
DEFINES += $$QMAKE_DEFINES_XCB | ||
LIBS += $$QMAKE_LIBS_XCB | ||
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB | ||
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB | ||
|
||
CONFIG += qpa/genericunixfontdatabase | ||
|
||
@@ -87,7 +85,8 @@ | ||
contains(QT_CONFIG, xcb-qt) { | ||
DEFINES += XCB_USE_RENDER | ||
XCB_DIR = ../../../3rdparty/xcb | ||
- INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude | ||
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static | ||
} else { | ||
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000 | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000 | ||
@@ -9,7 +9,8 @@ | ||
|
||
XCB_DIR = ../../../../3rdparty/xcb | ||
|
||
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude | ||
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude | ||
+QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude | ||
|
||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB | ||
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400 | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400 | ||
@@ -6,6 +6,13 @@ | ||
qxcbmain.cpp | ||
OTHER_FILES += xcb.json README | ||
|
||
+contains(QT_CONFIG, xcb-qt) { | ||
+ DEFINES += XCB_USE_RENDER | ||
+ XCB_DIR = ../../../3rdparty/xcb | ||
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+} | ||
+ | ||
PLUGIN_TYPE = platforms | ||
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin | ||
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = - |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000 | ||
+++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000 | ||
@@ -244,7 +244,7 @@ | ||
load(qt_targets) | ||
|
||
# this builds on top of qt_common | ||
-!internal_module:!lib_bundle:if(unix|mingw) { | ||
+unix|mingw { | ||
CONFIG += create_pc | ||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
host_build: \ |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} | ||
|
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/src/plugins/platforms/windows/qwindowscontext.h | ||
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h 2015-06-29 22:04:40.000000000 +0200 | ||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h 2015-11-01 12:55:59.751234846 +0100 | ||
@@ -124,10 +124,18 @@ | ||
inline void init(); | ||
|
||
typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **); | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, ITEMIDLIST **); | ||
+#else | ||
typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, PIDLIST_ABSOLUTE *); | ||
+#endif | ||
typedef HRESULT (WINAPI *SHGetStockIconInfo)(int , int , _SHSTOCKICONINFO *); | ||
typedef HRESULT (WINAPI *SHGetImageList)(int, REFIID , void **); | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ typedef HRESULT (WINAPI *SHCreateItemFromIDList)(const ITEMIDLIST *, REFIID, void **); | ||
+#else | ||
typedef HRESULT (WINAPI *SHCreateItemFromIDList)(PCIDLIST_ABSOLUTE, REFIID, void **); | ||
+#endif | ||
|
||
SHCreateItemFromParsingName sHCreateItemFromParsingName; | ||
SHGetKnownFolderIDList sHGetKnownFolderIDList; | ||
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | ||
--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp 2015-06-29 22:04:40.000000000 +0200 | ||
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp 2015-11-01 13:41:09.503149772 +0100 | ||
@@ -1008,7 +1008,11 @@ | ||
qWarning() << __FUNCTION__ << ": Invalid CLSID: " << url.path(); | ||
return Q_NULLPTR; | ||
} | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ ITEMIDLIST *idList; | ||
+#else | ||
PIDLIST_ABSOLUTE idList; | ||
+#endif | ||
HRESULT hr = QWindowsContext::shell32dll.sHGetKnownFolderIDList(uuid, 0, 0, &idList); | ||
if (FAILED(hr)) { | ||
qErrnoWarning("%s: SHGetKnownFolderIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString())); |