Attachment #390150 for bug #516864




  # to always look for includes there:
  #set(CMAKE_INCLUDE_CURRENT_DIR ON)

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)
ENDIF()

# Include the qtmain lib if we are on the windows platform

Lines 27-35 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) Link Here

(-)a/src/HelpBrowser/CMakeLists.txt (-2 / +1 lines)
27	QT5_WRAP_CPP(FILES_MOC ${FILES_H})	27	QT5_WRAP_CPP(FILES_MOC ${FILES_H})
28	QT5_WRAP_UI(FILES_UI_H ${FILES_UI})	28	QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
29		29
30
31	ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})	30	ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
32	qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)	31	qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
33		32
34	SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)	33	SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
35	SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)	34	SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)




#include "ui_HelpBrowser.h"
#include "ui_HelpSideBar.h"

#include <QDebug>
#include <QAction>
#include <QBuffer>
#include <QDir>

#include <QModelIndex>
#include <QModelIndexList>
#include <QPainter>
#include <QPrinter>
#include <QPrintDialog>
#include <QProcess>
#include <QPushButton>
#include <QString>

#include <QXmlDefaultHandler>
#include <QDesktopServices>

#include <QtPrintSupport/QPrinter>
#include <QtPrintSupport/QPrintDialog>



#include "Common/global.h"
#include "HelpBrowser/schelptreemodel.h"

Return to bug 516864

Lines 18-36 include(cmake/Internationalization.cmake) Link Here

(-)a/CMakeLists.txt (-12 / +13 lines)
18	# to always look for includes there:	18	# to always look for includes there:
19	#set(CMAKE_INCLUDE_CURRENT_DIR ON)	19	#set(CMAKE_INCLUDE_CURRENT_DIR ON)
20		20
21	find_package(Qt5Core)	21	find_package(Qt5Core REQUIRED)
22	find_package(Qt5Concurrent)	22	find_package(Qt5Concurrent REQUIRED)
23	find_package(Qt5Widgets)	23	find_package(Qt5Widgets REQUIRED)
24	find_package(Qt5Gui)	24	find_package(Qt5Gui REQUIRED)
25	find_package(Qt5Declarative)	25	find_package(Qt5Declarative REQUIRED)
26	find_package(Qt5WebKit)	26	find_package(Qt5WebKit REQUIRED)
27	find_package(Qt5WebKitWidgets)	27	find_package(Qt5WebKitWidgets REQUIRED)
28	find_package(Qt5Xml)	28	find_package(Qt5Xml REQUIRED)
29	find_package(Qt5Sql)	29	find_package(Qt5Sql REQUIRED)
30	find_package(Qt5Network)	30	find_package(Qt5Network REQUIRED)
31	find_package(Qt5LinguistTools)	31	find_package(Qt5LinguistTools REQUIRED)
		32	find_package(Qt5PrintSupport REQUIRED)
32	IF(WIN32)	33	IF(WIN32)
33	find_package(Qt5WinExtras)	34	find_package(Qt5WinExtras)
34	ENDIF()	35	ENDIF()
35		36
36	# Include the qtmain lib if we are on the windows platform	37	# Include the qtmain lib if we are on the windows platform

Lines 30-35 for which a new license (GPL+exception) is in place. Link Here

(-)a/src/HelpBrowser/helpbrowser.cpp (-3 / +5 lines)
30	#include "ui_HelpBrowser.h"	30	#include "ui_HelpBrowser.h"
31	#include "ui_HelpSideBar.h"	31	#include "ui_HelpSideBar.h"
32		32
		33	#include <QDebug>
33	#include <QAction>	34	#include <QAction>
34	#include <QBuffer>	35	#include <QBuffer>
35	#include <QDir>	36	#include <QDir>
Lines 45-52 for which a new license (GPL+exception) is in place. Link Here
45	#include <QModelIndex>	46	#include <QModelIndex>
46	#include <QModelIndexList>	47	#include <QModelIndexList>
47	#include <QPainter>	48	#include <QPainter>
48	#include <QPrinter>
49	#include <QPrintDialog>
50	#include <QProcess>	49	#include <QProcess>
51	#include <QPushButton>	50	#include <QPushButton>
52	#include <QString>	51	#include <QString>
Lines 56-62 for which a new license (GPL+exception) is in place. Link Here
56	#include <QXmlDefaultHandler>	55	#include <QXmlDefaultHandler>
57	#include <QDesktopServices>	56	#include <QDesktopServices>
58		57
59	#include <QDebug>	58	#include <QtPrintSupport/QPrinter>
		59	#include <QtPrintSupport/QPrintDialog>
		60
		61
60		62
61	#include "Common/global.h"	63	#include "Common/global.h"
62	#include "HelpBrowser/schelptreemodel.h"	64	#include "HelpBrowser/schelptreemodel.h"