From 64e3484c8e02bf5f8698dd6c8a8bbea47c05fb30 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Mon, 16 Dec 2013 06:39:45 +0100 Subject: libraries/qt5: Added (multi-platform C++ GUI toolkit). Signed-off-by: Matteo Bernardini --- libraries/qt5/patches/platformplugin-install-path-fix.patch | 13 +++++++++++++ libraries/qt5/patches/qt5.mysql.h.diff | 12 ++++++++++++ .../qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch | 12 ++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 libraries/qt5/patches/platformplugin-install-path-fix.patch create mode 100644 libraries/qt5/patches/qt5.mysql.h.diff create mode 100644 libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch (limited to 'libraries/qt5/patches') diff --git a/libraries/qt5/patches/platformplugin-install-path-fix.patch b/libraries/qt5/patches/platformplugin-install-path-fix.patch new file mode 100644 index 0000000000..022166de66 --- /dev/null +++ b/libraries/qt5/patches/platformplugin-install-path-fix.patch @@ -0,0 +1,13 @@ +diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro +--- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-04-09 00:11:38.000000000 +0000 ++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-05-31 01:18:29.157175082 +0000 +@@ -20,7 +20,8 @@ + } + } + +-DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit ++target.path = $$[QT_INSTALL_PLUGINS]/webkit ++INSTALLS += target + + SOURCES += \ + WebPlugin.cpp \ diff --git a/libraries/qt5/patches/qt5.mysql.h.diff b/libraries/qt5/patches/qt5.mysql.h.diff new file mode 100644 index 0000000000..41dc9d34d5 --- /dev/null +++ b/libraries/qt5/patches/qt5.mysql.h.diff @@ -0,0 +1,12 @@ +diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h +--- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000 ++++ qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000 +@@ -60,7 +60,7 @@ + #include + #endif + +-#include ++#include + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch b/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch new file mode 100644 index 0000000000..57a044ed92 --- /dev/null +++ b/libraries/qt5/patches/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch @@ -0,0 +1,12 @@ +diff -up qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp +--- qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz 2013-09-27 06:05:10.000000000 -0500 ++++ qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp 2013-10-01 12:20:23.089054279 -0500 +@@ -1098,7 +1098,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG + hb_buffer_set_segment_properties(buffer, &props); + hb_buffer_guess_segment_properties(buffer); + +- uint buffer_flags = HB_BUFFER_FLAG_DEFAULT; ++ uint buffer_flags = HB_BUFFER_FLAGS_DEFAULT; + // Symbol encoding used to encode various crap in the 32..255 character code range, + // and thus might override U+00AD [SHY]; avoid hiding default ignorables + if (actualFontEngine->symbol) -- cgit v1.2.3-65-gdbad