mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 09:42:10 +02:00
Show headers in qtc6 + we can use qt cmake macro as we depend against
qt5.15
This commit is contained in:
parent
a8a9a5d7e5
commit
1906529b68
|
@ -2,12 +2,12 @@ include(ECMMarkAsTest)
|
||||||
|
|
||||||
set(falkon_autotests_SRCS )
|
set(falkon_autotests_SRCS )
|
||||||
|
|
||||||
qt5_add_resources(falkon_autotests_SRCS autotests.qrc)
|
qt_add_resources(falkon_autotests_SRCS autotests.qrc)
|
||||||
|
|
||||||
macro(falkon_tests)
|
macro(falkon_tests)
|
||||||
foreach(_testname ${ARGN})
|
foreach(_testname ${ARGN})
|
||||||
add_executable(${_testname} ${_testname}.cpp ${falkon_autotests_SRCS})
|
add_executable(${_testname} ${_testname}.cpp ${_testname}.h ${falkon_autotests_SRCS})
|
||||||
target_link_libraries(${_testname} Qt5::Test FalkonPrivate)
|
target_link_libraries(${_testname} Qt::Test FalkonPrivate)
|
||||||
add_test(NAME falkon-${_testname} COMMAND ${_testname})
|
add_test(NAME falkon-${_testname} COMMAND ${_testname})
|
||||||
ecm_mark_as_test(${_testname})
|
ecm_mark_as_test(${_testname})
|
||||||
set_tests_properties(falkon-${_testname} PROPERTIES RUN_SERIAL TRUE)
|
set_tests_properties(falkon-${_testname} PROPERTIES RUN_SERIAL TRUE)
|
||||||
|
@ -46,7 +46,7 @@ set(falkon_autotests_SRCS
|
||||||
macro(falkon_qml_tests)
|
macro(falkon_qml_tests)
|
||||||
foreach(_testname ${ARGN})
|
foreach(_testname ${ARGN})
|
||||||
add_executable(${_testname} qml/${_testname}.cpp ${falkon_autotests_SRCS})
|
add_executable(${_testname} qml/${_testname}.cpp ${falkon_autotests_SRCS})
|
||||||
target_link_libraries(${_testname} Qt5::Test FalkonPrivate)
|
target_link_libraries(${_testname} Qt::Test FalkonPrivate)
|
||||||
add_test(NAME falkon-qml-${_testname} COMMAND ${_testname})
|
add_test(NAME falkon-qml-${_testname} COMMAND ${_testname})
|
||||||
ecm_mark_as_test(${_testname})
|
ecm_mark_as_test(${_testname})
|
||||||
set_tests_properties(falkon-qml-${_testname} PROPERTIES RUN_SERIAL TRUE)
|
set_tests_properties(falkon-qml-${_testname} PROPERTIES RUN_SERIAL TRUE)
|
||||||
|
|
|
@ -283,7 +283,7 @@ if (APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TODO: use ki18n_wrap_ui?
|
# TODO: use ki18n_wrap_ui?
|
||||||
qt5_wrap_ui(SRCS
|
qt_wrap_ui(SRCS
|
||||||
adblock/adblockaddsubscriptiondialog.ui
|
adblock/adblockaddsubscriptiondialog.ui
|
||||||
adblock/adblockdialog.ui
|
adblock/adblockdialog.ui
|
||||||
autofill/autofillnotification.ui
|
autofill/autofillnotification.ui
|
||||||
|
@ -331,7 +331,7 @@ qt5_wrap_ui(SRCS
|
||||||
webtab/searchtoolbar.ui
|
webtab/searchtoolbar.ui
|
||||||
)
|
)
|
||||||
|
|
||||||
qt5_add_resources(SRCS
|
qt_add_resources(SRCS
|
||||||
data/data.qrc
|
data/data.qrc
|
||||||
data/html.qrc
|
data/html.qrc
|
||||||
data/icons.qrc
|
data/icons.qrc
|
||||||
|
@ -341,17 +341,17 @@ qt5_add_resources(SRCS
|
||||||
|
|
||||||
add_library(FalkonPrivate SHARED ${SRCS} ${LOGGING_SRCS})
|
add_library(FalkonPrivate SHARED ${SRCS} ${LOGGING_SRCS})
|
||||||
|
|
||||||
get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt5::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
|
get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
|
||||||
target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS})
|
target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS})
|
||||||
|
|
||||||
target_link_libraries(FalkonPrivate
|
target_link_libraries(FalkonPrivate
|
||||||
Qt5::Widgets
|
Qt::Widgets
|
||||||
Qt5::WebEngineWidgets
|
Qt::WebEngineWidgets
|
||||||
Qt5::Network
|
Qt::Network
|
||||||
Qt5::Sql
|
Qt::Sql
|
||||||
Qt5::PrintSupport
|
Qt::PrintSupport
|
||||||
Qt5::QuickWidgets
|
Qt::QuickWidgets
|
||||||
Qt5::WebChannel
|
Qt::WebChannel
|
||||||
KF5::Archive
|
KF5::Archive
|
||||||
${OPENSSL_CRYPTO_LIBRARY}
|
${OPENSSL_CRYPTO_LIBRARY}
|
||||||
)
|
)
|
||||||
|
@ -363,7 +363,7 @@ endif()
|
||||||
|
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
if (NOT NO_X11)
|
if (NOT NO_X11)
|
||||||
target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras)
|
target_link_libraries(FalkonPrivate XCB::XCB Qt::X11Extras)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(FalkonPrivate PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION "3")
|
set_target_properties(FalkonPrivate PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION "3")
|
||||||
|
@ -371,7 +371,7 @@ if (UNIX AND NOT APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
target_link_libraries(FalkonPrivate Qt5::WinExtras)
|
target_link_libraries(FalkonPrivate Qt::WinExtras)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
|
@ -379,5 +379,5 @@ if (APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT DISABLE_DBUS)
|
if (NOT DISABLE_DBUS)
|
||||||
target_link_libraries(FalkonPrivate Qt5::DBus)
|
target_link_libraries(FalkonPrivate Qt::DBus)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QFlags>
|
#include <QFlags>
|
||||||
#include <QtWebEngineVersion>
|
#include <QtWebEngine/QtWebEngineVersion>
|
||||||
|
|
||||||
#ifdef FALKON_SHAREDLIBRARY
|
#ifdef FALKON_SHAREDLIBRARY
|
||||||
#define FALKON_EXPORT Q_DECL_EXPORT
|
#define FALKON_EXPORT Q_DECL_EXPORT
|
||||||
|
|
|
@ -10,12 +10,12 @@ ecm_create_qm_loader( AutoScroll_SRCS falkon_autoscroll_qt )
|
||||||
set( AutoScroll_UIS
|
set( AutoScroll_UIS
|
||||||
autoscrollsettings.ui
|
autoscrollsettings.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${AutoScroll_UIS})
|
qt_wrap_ui(UIS ${AutoScroll_UIS})
|
||||||
|
|
||||||
set( AutoScroll_RSCS
|
set( AutoScroll_RSCS
|
||||||
autoscroll.qrc
|
autoscroll.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${AutoScroll_RSCS})
|
qt_add_resources(RSCS ${AutoScroll_RSCS})
|
||||||
|
|
||||||
add_library(AutoScroll MODULE ${AutoScroll_SRCS} ${UIS} ${RSCS})
|
add_library(AutoScroll MODULE ${AutoScroll_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS AutoScroll DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS AutoScroll DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -10,12 +10,12 @@ set( FlashCookieManager_UIS
|
||||||
fcm_dialog.ui
|
fcm_dialog.ui
|
||||||
fcm_notification.ui
|
fcm_notification.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${FlashCookieManager_UIS})
|
qt_wrap_ui(UIS ${FlashCookieManager_UIS})
|
||||||
|
|
||||||
set( FlashCookieManager_RSCS
|
set( FlashCookieManager_RSCS
|
||||||
flashcookiemanager.qrc
|
flashcookiemanager.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${FlashCookieManager_RSCS})
|
qt_add_resources(RSCS ${FlashCookieManager_RSCS})
|
||||||
|
|
||||||
add_library(FlashCookieManager MODULE ${FlashCookieManager_SRCS} ${UIS} ${RSCS})
|
add_library(FlashCookieManager MODULE ${FlashCookieManager_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS FlashCookieManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS FlashCookieManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -23,12 +23,12 @@ set( GreaseMonkey_UIS
|
||||||
settings/gm_settings.ui
|
settings/gm_settings.ui
|
||||||
settings/gm_settingsscriptinfo.ui
|
settings/gm_settingsscriptinfo.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${GreaseMonkey_UIS})
|
qt_wrap_ui(UIS ${GreaseMonkey_UIS})
|
||||||
|
|
||||||
set( GreaseMonkey_RSCS
|
set( GreaseMonkey_RSCS
|
||||||
greasemonkey.qrc
|
greasemonkey.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${GreaseMonkey_RSCS})
|
qt_add_resources(RSCS ${GreaseMonkey_RSCS})
|
||||||
|
|
||||||
add_library(GreaseMonkey MODULE ${GreaseMonkey_SRCS} ${UIS} ${RSCS})
|
add_library(GreaseMonkey MODULE ${GreaseMonkey_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS GreaseMonkey DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS GreaseMonkey DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -9,7 +9,7 @@ ecm_create_qm_loader(KDEFrameworksIntegration_SRCS falkon_kdeframeworksintegrati
|
||||||
set(KDEFrameworksIntegration_RSCS
|
set(KDEFrameworksIntegration_RSCS
|
||||||
kdeframeworksintegration.qrc
|
kdeframeworksintegration.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${KDEFrameworksIntegration_RSCS})
|
qt_add_resources(RSCS ${KDEFrameworksIntegration_RSCS})
|
||||||
|
|
||||||
add_library(KDEFrameworksIntegration MODULE ${KDEFrameworksIntegration_SRCS} ${RSCS})
|
add_library(KDEFrameworksIntegration MODULE ${KDEFrameworksIntegration_SRCS} ${RSCS})
|
||||||
install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -19,12 +19,12 @@ ecm_create_qm_loader( MouseGestures_SRCS falkon_mousegestures_qt )
|
||||||
set( MouseGestures_UIS
|
set( MouseGestures_UIS
|
||||||
mousegesturessettingsdialog.ui
|
mousegesturessettingsdialog.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${MouseGestures_UIS})
|
qt_wrap_ui(UIS ${MouseGestures_UIS})
|
||||||
|
|
||||||
set( MouseGestures_RSCS
|
set( MouseGestures_RSCS
|
||||||
mousegestures.qrc
|
mousegestures.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${MouseGestures_RSCS})
|
qt_add_resources(RSCS ${MouseGestures_RSCS})
|
||||||
|
|
||||||
KDE_ENABLE_EXCEPTIONS()
|
KDE_ENABLE_EXCEPTIONS()
|
||||||
|
|
||||||
|
|
|
@ -9,12 +9,12 @@ ecm_create_qm_loader( PIM_SRCS falkon_pim_qt )
|
||||||
set( PIM_UIS
|
set( PIM_UIS
|
||||||
PIM_settings.ui
|
PIM_settings.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${PIM_UIS})
|
qt_wrap_ui(UIS ${PIM_UIS})
|
||||||
|
|
||||||
set( PIM_RSCS
|
set( PIM_RSCS
|
||||||
PIM_res.qrc
|
PIM_res.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${PIM_RSCS})
|
qt_add_resources(RSCS ${PIM_RSCS})
|
||||||
|
|
||||||
add_library(PIM MODULE ${PIM_SRCS} ${UIS} ${RSCS})
|
add_library(PIM MODULE ${PIM_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS PIM DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS PIM DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -20,12 +20,12 @@ set( StatusBarIcons_UIS
|
||||||
sbi_networkicondialog.ui
|
sbi_networkicondialog.ui
|
||||||
sbi_settingsdialog.ui
|
sbi_settingsdialog.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${StatusBarIcons_UIS})
|
qt_wrap_ui(UIS ${StatusBarIcons_UIS})
|
||||||
|
|
||||||
set( StatusBarIcons_RSCS
|
set( StatusBarIcons_RSCS
|
||||||
statusbaricons.qrc
|
statusbaricons.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${StatusBarIcons_RSCS})
|
qt_add_resources(RSCS ${StatusBarIcons_RSCS})
|
||||||
|
|
||||||
add_library(StatusBarIcons MODULE ${StatusBarIcons_SRCS} ${UIS} ${RSCS})
|
add_library(StatusBarIcons MODULE ${StatusBarIcons_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS StatusBarIcons DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS StatusBarIcons DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -13,13 +13,13 @@ set( TabManager_UIS
|
||||||
tabmanagerwidget.ui
|
tabmanagerwidget.ui
|
||||||
tabmanagersettings.ui
|
tabmanagersettings.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${TabManager_UIS})
|
qt_wrap_ui(UIS ${TabManager_UIS})
|
||||||
|
|
||||||
set( TabManager_RSCS
|
set( TabManager_RSCS
|
||||||
tabmanagerplugin.qrc
|
tabmanagerplugin.qrc
|
||||||
tldextractor/tldextractor.qrc
|
tldextractor/tldextractor.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${TabManager_RSCS})
|
qt_add_resources(RSCS ${TabManager_RSCS})
|
||||||
|
|
||||||
add_library(TabManager MODULE ${TabManager_SRCS} ${UIS} ${RSCS})
|
add_library(TabManager MODULE ${TabManager_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS TabManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS TabManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -26,10 +26,10 @@ class TestPlugin_Sidebar : public SideBarInterface
|
||||||
public:
|
public:
|
||||||
explicit TestPlugin_Sidebar(QObject* parent = 0);
|
explicit TestPlugin_Sidebar(QObject* parent = 0);
|
||||||
|
|
||||||
QString title() const;
|
QString title() const override;
|
||||||
QAction* createMenuAction();
|
QAction* createMenuAction() override;
|
||||||
|
|
||||||
QWidget* createSideBarWidget(BrowserWindow* mainWindow);
|
QWidget* createSideBarWidget(BrowserWindow* mainWindow) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TESTPLUGIN_SIDEBAR_H
|
#endif // TESTPLUGIN_SIDEBAR_H
|
||||||
|
|
|
@ -17,12 +17,12 @@ ecm_create_qm_loader( VerticalTabs_SRCS falkon_verticaltabs_qt )
|
||||||
set( VerticalTabs_UIS
|
set( VerticalTabs_UIS
|
||||||
verticaltabssettings.ui
|
verticaltabssettings.ui
|
||||||
)
|
)
|
||||||
qt5_wrap_ui(UIS ${VerticalTabs_UIS})
|
qt_wrap_ui(UIS ${VerticalTabs_UIS})
|
||||||
|
|
||||||
set( VerticalTabs_RSCS
|
set( VerticalTabs_RSCS
|
||||||
verticaltabs.qrc
|
verticaltabs.qrc
|
||||||
)
|
)
|
||||||
qt5_add_resources(RSCS ${VerticalTabs_RSCS})
|
qt_add_resources(RSCS ${VerticalTabs_RSCS})
|
||||||
|
|
||||||
add_library(VerticalTabs MODULE ${VerticalTabs_SRCS} ${UIS} ${RSCS})
|
add_library(VerticalTabs MODULE ${VerticalTabs_SRCS} ${UIS} ${RSCS})
|
||||||
install(TARGETS VerticalTabs DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
install(TARGETS VerticalTabs DESTINATION ${FALKON_INSTALL_PLUGINDIR})
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
set(falkon_benchmarks_SRCS )
|
set(falkon_benchmarks_SRCS )
|
||||||
|
|
||||||
qt5_add_resources(falkon_benchmarks_SRCS benchmarks.qrc)
|
qt_add_resources(falkon_benchmarks_SRCS benchmarks.qrc)
|
||||||
|
|
||||||
macro(falkon_benchmarks)
|
macro(falkon_benchmarks)
|
||||||
foreach(_benchmarkname ${ARGN})
|
foreach(_benchmarkname ${ARGN})
|
||||||
add_executable(${_benchmarkname} ${_benchmarkname}.cpp ${falkon_benchmarks_SRCS})
|
add_executable(${_benchmarkname} ${_benchmarkname}.cpp ${falkon_benchmarks_SRCS})
|
||||||
target_link_libraries(${_benchmarkname} Qt5::Test FalkonPrivate)
|
target_link_libraries(${_benchmarkname} Qt::Test FalkonPrivate)
|
||||||
#add_test(NAME falkon-${_benchmarkname} COMMAND ${_benchmarkname})
|
#add_test(NAME falkon-${_benchmarkname} COMMAND ${_benchmarkname})
|
||||||
#ecm_mark_as_test(${_benchmarkname})
|
#ecm_mark_as_test(${_benchmarkname})
|
||||||
#set_tests_properties(falkon-${_benchmarkname} PROPERTIES RUN_SERIAL TRUE)
|
#set_tests_properties(falkon-${_benchmarkname} PROPERTIES RUN_SERIAL TRUE)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user