Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use webkitwidgets by default

This commit is contained in:
Martchus 2015-12-26 00:25:06 +01:00
parent 7936bbb623
commit 41571969ea
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -156,8 +156,14 @@ find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5WebKitWidgets REQUIRED)
find_package(Qt5Script REQUIRED)
find_package(Qt5WebKitWidgets)
if(Qt5WebKitWidgets_FOUND)
set(WEBVIEW_PROVIDER Qt5::WebKitWidgets)
else()
find_package(Qt5WebEngineWidgets REQUIRED)
set(WEBVIEW_PROVIDER Qt5::Qt5WebEngineWidgets)
endif()
# enable moc, uic and rcc
set(CMAKE_AUTOMOC ON)
@ -171,7 +177,7 @@ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
# executable and linking
add_executable(${META_PROJECT_NAME} ${GUI_TYPE} ${HEADER_FILES} ${SRC_FILES} ${WIDGETS_HEADER_FILES} ${WIDGETS_SRC_FILES} ${QM_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH})
target_link_libraries(${META_PROJECT_NAME} c++utilities qtutilities tagparser pthread Qt5::Core Qt5::Widgets Qt5::WebKitWidgets Qt5::Script)
target_link_libraries(${META_PROJECT_NAME} c++utilities qtutilities tagparser pthread Qt5::Core Qt5::Widgets Qt5::Script ${WEBVIEW_PROVIDER})
set_target_properties(${META_PROJECT_NAME} PROPERTIES
CXX_STANDARD 11
)

2
README.md
View File

@ -115,7 +115,7 @@ The application depends on c++utilities, qtutilities and tagparser and is built
The following Qt 5 modules are requried: core gui script widgets webenginewidgets/webkitwidgets
If webenginewidgets is installed on the system, the editor will link against it. To force usage of webkitwidgets
If webkitwidgets is installed on the system, the editor will link against it. Otherwise it will link against webenginewidgets. To force usage of webkitwidgets
add "CONFIG+=forcewebkit" to the qmake arguments.
## TODO

8
tageditor.pro
View File

@ -16,12 +16,12 @@ VERSION = 1.3.0
# basic configuration: application
TEMPLATE = app
QT += core gui widgets script
# use webenginewidgets if available; otherwise use webkitwidgets
!forcewebkit:qtHaveModule(webenginewidgets) {
# use webkitwidgets if available; otherwise use webenginewidgets
!forcewebengine:qtHaveModule(webkitwidgets) {
QT += webkitwidgets
} else {
QT += webenginewidgets
DEFINES += TAGEDITOR_USE_WEBENGINE
} else {
QT += webkitwidgets
}
# add project files