Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
Krita
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ashwin Dhakaita
Krita
Commits
589dc86b
Commit
589dc86b
authored
Jul 18, 2017
by
Alvin Wong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Qt to 5.9.1 for Windows
Maniphest Tasks: T6521, T6503
parent
17657f5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
20 deletions
+38
-20
3rdparty/ext_qt/CMakeLists.txt
3rdparty/ext_qt/CMakeLists.txt
+25
-7
3rdparty/ext_qt/disable-wintab.diff
3rdparty/ext_qt/disable-wintab.diff
+13
-13
No files found.
3rdparty/ext_qt/CMakeLists.txt
View file @
589dc86b
SET
(
EXTPREFIX_qt
"
${
EXTPREFIX
}
"
)
if
(
WIN32
)
list
(
APPEND _QT_conf -skip qt3d -skip qtactiveqt -skip qtcanvas3d
-skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects
-skip qtlocation -skip qtsensors -skip qtserialport -skip qtwayland
-skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview
-skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools
-no-compile-examples -no-dbus -no-iconv -no-angle -no-qml-debug -no-ssl
-no-openssl -no-libproxy -no-system-proxies -no-icu -no-mtdev
-skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtnetworkauth
-skip qtpurchasing -skip qtremoteobjects -skip qtscxml -skip qtserialbus
-skip qtspeech -skip qtvirtualkeyboard
#
-opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg
#
-opensource -confirm-license
#
-release -platform win32-g++ -prefix
${
EXTPREFIX_qt
}
# Uncomment this line for building Qt with debugging info enabled
#-force-debug-info
)
ExternalProject_Add
(
ext_qt
DOWNLOAD_DIR
${
EXTERNALS_DOWNLOAD_DIR
}
URL https://download.qt.io/
official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-
1.zip
URL_MD5
9d7ea0cadcec7b5a63e8e83686756978
URL https://download.qt.io/
archive/qt/5.9/5.9.1/single/qt-everywhere-opensource-src-5.9.
1.zip
URL_MD5
3f2e538ccc468d28bcfdefac96d1e975
PATCH_COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/disable-wintab.diff
COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/qtgui-private-headers.diff
COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
...
...
@@ -12,15 +31,14 @@ if (WIN32)
COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0003-Hack-for-fullscreen-workaround.patch
INSTALL_DIR
${
EXTPREFIX_qt
}
CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix
${
EXTPREFIX_qt
}
-platform win32-g++
# use this line for building Qt with debugging info enabled
#CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -release -force-debug-info -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix ${EXTPREFIX_qt} -platform win32-g++
CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat
${
_QT_conf
}
BUILD_COMMAND mingw32-make -j
${
SUBMAKE_JOBS
}
INSTALL_COMMAND mingw32-make -j
${
SUBMAKE_JOBS
}
install
UPDATE_COMMAND
""
BUILD_IN_SOURCE 1
# Use a short name to reduce the chance of exceeding path length limit
SOURCE_DIR s
BINARY_DIR b
DEPENDS ext_patch
)
elseif
(
NOT APPLE
)
...
...
3rdparty/ext_qt/disable-wintab.diff
View file @
589dc86b
...
...
@@ -2,21 +2,21 @@ diff --git a/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp b/qtbase/s
index 4934b6c..613e8fe 100644
--- a/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -2
99,9 +299,6 @@
struct QWindowsContextPrivate {
@@ -2
38,9 +238,6 @@
QWindowsMimeConverter m_mimeConverter;
QWindowsScreenManager m_screenManager;
QSharedPointer<QWindowCreationContext> m_creationContext;
-#if
!defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE
)
-#if
QT_CONFIG(tabletevent
)
- QScopedPointer<QWindowsTabletSupport> m_tabletSupport;
-#endif
const HRESULT m_oleInitializeResult;
const QByteArray m_eventType;
QWindow *m_lastActiveWindow;
@@ -
346,17 +343,10 @@
QWindowsContext::QWindowsContext() :
QWindow *m_lastActiveWindow
= nullptr
;
@@ -
279,17 +276,10 @@
const QByteArray bv = qgetenv("QT_QPA_VERBOSE");
if (!bv.isEmpty())
QLoggingCategory::setFilterRules(QString::fromLocal8Bit(bv));
-#if
!defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE
)
-#if
QT_CONFIG(tabletevent
)
- d->m_tabletSupport.reset(QWindowsTabletSupport::create());
- qCDebug(lcQpaTablet) << "Tablet support: " << (d->m_tabletSupport.isNull() ? QStringLiteral("None") : d->m_tabletSupport->description());
-#endif
...
...
@@ -24,17 +24,17 @@ index 4934b6c..613e8fe 100644
QWindowsContext::~QWindowsContext()
{
-#if
!defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE
)
-#if
QT_CONFIG(tabletevent
)
- d->m_tabletSupport.reset(); // Destroy internal window before unregistering classes.
-#endif
unregisterWindowClasses();
if (d->m_oleInitializeResult == S_OK || d->m_oleInitializeResult == S_FALSE)
OleUninitialize();
@@ -3
97,12 +387,7 @@
bool QWindowsContext::initTouch(unsigned integrationOptions)
@@ -3
35,12 +325,7 @@
void QWindowsContext::setTabletAbsoluteRange(int a)
{
-#if
!defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE
)
-#if
QT_CONFIG(tabletevent
)
- if (!d->m_tabletSupport.isNull())
- d->m_tabletSupport->setAbsoluteRange(a);
-#else
...
...
@@ -43,11 +43,11 @@ index 4934b6c..613e8fe 100644
}
int QWindowsContext::processDpiAwareness()
@@ -7
92,11 +777,7 @@
QWindowsScreenManager &QWindowsContext::screenManager()
@@ -7
00,11 +685,7 @@
QWindowsTabletSupport *QWindowsContext::tabletSupport() const
{
-#if
!defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE
)
-#if
QT_CONFIG(tabletevent
)
- return d->m_tabletSupport.data();
-#else
return 0;
...
...
@@ -55,7 +55,7 @@ index 4934b6c..613e8fe 100644
}
/*!
@@ -1
166,10 +1147,6 @@
bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
@@ -1
077,10 +1058,6 @@
*result = LRESULT(MA_NOACTIVATE);
return true;
}
...
...
@@ -64,5 +64,5 @@ index 4934b6c..613e8fe 100644
- d->m_tabletSupport->notifyActivate();
-#endif // !QT_NO_TABLETEVENT
if (platformWindow->testFlag(QWindowsWindow::BlockedByModal))
if (const QWindow *modalWindow = QGuiApplication::modalWindow())
QWindowsWindow
::baseWindowOf(modalWindow)->alertWindow(
);
if (const QWindow *modalWindow = QGuiApplication::modalWindow())
{
QWindowsWindow
*platformWindow = QWindowsWindow::windowsWindowOf(modalWindow
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment