diff options
Diffstat (limited to 'testing/source/vtown/deps/qt5/patches')
-rw-r--r-- | testing/source/vtown/deps/qt5/patches/qt5.mysql.h.diff | 11 | ||||
-rw-r--r-- | testing/source/vtown/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch | 14 |
2 files changed, 0 insertions, 25 deletions
diff --git a/testing/source/vtown/deps/qt5/patches/qt5.mysql.h.diff b/testing/source/vtown/deps/qt5/patches/qt5.mysql.h.diff deleted file mode 100644 index f1cf11b9..00000000 --- a/testing/source/vtown/deps/qt5/patches/qt5.mysql.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200 -+++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200 -@@ -57,7 +57,7 @@ - #include <QtCore/qt_windows.h> - #endif - --#include <mysql.h> -+#include <mysql/mysql.h> - - #ifdef QT_PLUGIN - #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/testing/source/vtown/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch b/testing/source/vtown/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch deleted file mode 100644 index ff00e63b..00000000 --- a/testing/source/vtown/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo 2019-04-30 15:18:24.886346423 -0500 -+++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-30 15:19:48.303873296 -0500 -@@ -66,8 +66,10 @@ unset(_GL_INCDIRS) - # Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is - # optional. - -+if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include") - list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR}) - set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR}) -+endif() - - unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) - |