diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-10-25 23:04:53 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-10-25 23:04:53 +0000 |
commit | 32bcfd1eed37151eb964e565d436417720b99ac4 (patch) | |
tree | 4d23d3893b4f192d9cf9d753757d14eee05f65b3 /graphics/luminance-qt5/files | |
parent | 0b38690bcc1b092046e5559fa8e4430af4b48136 (diff) | |
download | ports-32bcfd1eed37151eb964e565d436417720b99ac4.tar.gz ports-32bcfd1eed37151eb964e565d436417720b99ac4.zip |
Notes
Diffstat (limited to 'graphics/luminance-qt5/files')
-rw-r--r-- | graphics/luminance-qt5/files/patch-git_07e36ef8 | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/graphics/luminance-qt5/files/patch-git_07e36ef8 b/graphics/luminance-qt5/files/patch-git_07e36ef8 new file mode 100644 index 000000000000..9154cf7cf6d0 --- /dev/null +++ b/graphics/luminance-qt5/files/patch-git_07e36ef8 @@ -0,0 +1,87 @@ +This is a bug fix commit required to make the port work correctly with Qt 5.3. + +commit 07e36ef892343b01bf13545866823e6a55044382 +Author: Davide Anastasia <davide.anastasia@gmail.com> +Date: Mon Sep 29 08:06:15 2014 +0100 + + Fix QPrinter support + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -18,19 +18,20 @@ include(cmake/Internationalization.cmake) + # to always look for includes there: + #set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-find_package(Qt5Core) +-find_package(Qt5Concurrent) +-find_package(Qt5Widgets) +-find_package(Qt5Gui) +-find_package(Qt5Declarative) +-find_package(Qt5WebKit) +-find_package(Qt5WebKitWidgets) +-find_package(Qt5Xml) +-find_package(Qt5Sql) +-find_package(Qt5Network) +-find_package(Qt5LinguistTools) ++find_package(Qt5Core REQUIRED) ++find_package(Qt5Concurrent REQUIRED) ++find_package(Qt5Widgets REQUIRED) ++find_package(Qt5Gui REQUIRED) ++find_package(Qt5Declarative REQUIRED) ++find_package(Qt5WebKit REQUIRED) ++find_package(Qt5WebKitWidgets REQUIRED) ++find_package(Qt5Xml REQUIRED) ++find_package(Qt5Sql REQUIRED) ++find_package(Qt5Network REQUIRED) ++find_package(Qt5LinguistTools REQUIRED) ++find_package(Qt5PrintSupport REQUIRED) + IF(WIN32) +- find_package(Qt5WinExtras) ++ find_package(Qt5WinExtras) + ENDIF() + + # Include the qtmain lib if we are on the windows platform +--- src/HelpBrowser/CMakeLists.txt ++++ src/HelpBrowser/CMakeLists.txt +@@ -27,9 +27,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + +- + ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX}) +-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets) ++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE) +--- src/HelpBrowser/helpbrowser.cpp ++++ src/HelpBrowser/helpbrowser.cpp +@@ -30,6 +30,7 @@ for which a new license (GPL+exception) is in place. + #include "ui_HelpBrowser.h" + #include "ui_HelpSideBar.h" + ++#include <QDebug> + #include <QAction> + #include <QBuffer> + #include <QDir> +@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place. + #include <QModelIndex> + #include <QModelIndexList> + #include <QPainter> +-#include <QPrinter> +-#include <QPrintDialog> + #include <QProcess> + #include <QPushButton> + #include <QString> +@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place. + #include <QXmlDefaultHandler> + #include <QDesktopServices> + +-#include <QDebug> ++#include <QtPrintSupport/QPrinter> ++#include <QtPrintSupport/QPrintDialog> ++ ++ + + #include "Common/global.h" + #include "HelpBrowser/schelptreemodel.h" |