diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/web/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | lib/web/webprofile.cpp (renamed from src/webengine/webprofile.cpp) | 0 | ||||
| -rw-r--r-- | lib/web/webprofile.h (renamed from src/webengine/webprofile.h) | 0 | ||||
| -rw-r--r-- | plugins/ProfileEditor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/browser.cpp | 2 | ||||
| -rw-r--r-- | src/mainwindow/subwindow.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/widgets/pagemenu.cpp | 2 |
9 files changed, 25 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c3e378..cb86ce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,7 @@ add_subdirectory(lib/addressbar) add_subdirectory(lib/bookmarks) add_subdirectory(lib/downloads) add_subdirectory(lib/configuration) +add_subdirectory(lib/web) add_subdirectory(plugins/ProfileEditor) diff --git a/lib/web/CMakeLists.txt b/lib/web/CMakeLists.txt new file mode 100644 index 0000000..c5d5eba --- /dev/null +++ b/lib/web/CMakeLists.txt @@ -0,0 +1,17 @@ +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +# Instruct CMake to run moc automatically when needed. +set(CMAKE_AUTOMOC ON) + +add_library(web + webprofile.cpp + webprofile.h +) + +#target_include_directories(web +# PRIVATE ${Boost_INCLUDE_DIRS} +# PRIVATE .. +#) + +target_link_libraries(web Qt5::WebEngineWidgets) diff --git a/src/webengine/webprofile.cpp b/lib/web/webprofile.cpp index b40a98c..b40a98c 100644 --- a/src/webengine/webprofile.cpp +++ b/lib/web/webprofile.cpp diff --git a/src/webengine/webprofile.h b/lib/web/webprofile.h index 31c5b44..31c5b44 100644 --- a/src/webengine/webprofile.h +++ b/lib/web/webprofile.h diff --git a/plugins/ProfileEditor/CMakeLists.txt b/plugins/ProfileEditor/CMakeLists.txt index 0308fde..e5654ff 100644 --- a/plugins/ProfileEditor/CMakeLists.txt +++ b/plugins/ProfileEditor/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(ProfileEditorPlugin SHARED target_include_directories(ProfileEditorPlugin PRIVATE .. - PRIVATE ../../src/webengine) + PRIVATE ../../lib/web) target_link_libraries(ProfileEditorPlugin PRIVATE Qt5::Widgets diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d0ac915..0c6876d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,8 +33,6 @@ add_executable(poi # webengine webengine/urlinterceptor.cpp webengine/urlinterceptor.h - webengine/webprofile.cpp - webengine/webprofile.h webengine/webpage.cpp webengine/webpage.h webengine/webview.cpp @@ -51,7 +49,8 @@ add_executable(poi target_include_directories(poi PRIVATE ${Boost_INCLUDE_DIRS} PRIVATE ../lib ../plugins - PRIVATE ../lib/configuration) + PRIVATE ../lib/configuration + PRIVATE ../lib/web) target_link_libraries(poi Qt5::Core Qt5::Widgets Qt5::Concurrent Qt5::WebEngineWidgets @@ -59,7 +58,7 @@ target_link_libraries(poi about addressbar configuration - bookmarks downloads) + bookmarks downloads web) target_compile_definitions(poi PRIVATE QTBUG_65223_WORKAROUND diff --git a/src/browser.cpp b/src/browser.cpp index 11feac0..bb29ff7 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -11,7 +11,7 @@ #include "mainwindow/mainwindow.h" #include "mainwindow/subwindow.h" #include "webengine/urlinterceptor.h" -#include "webengine/webprofile.h" +#include <webprofile.h> #include <QAction> #include <bookmarks/bookmarkswidget.h> #include <configuration/configuration.h> diff --git a/src/mainwindow/subwindow.cpp b/src/mainwindow/subwindow.cpp index 17a2268..c282dd9 100644 --- a/src/mainwindow/subwindow.cpp +++ b/src/mainwindow/subwindow.cpp @@ -8,7 +8,7 @@ #include "subwindow.h" #include "browser.h" -#include "webengine/webprofile.h" +#include <webprofile.h> #include "webengine/webview.h" #include "widgets/tabwidget.h" #include <QAction> diff --git a/src/webengine/widgets/pagemenu.cpp b/src/webengine/widgets/pagemenu.cpp index dc104e6..c435d34 100644 --- a/src/webengine/widgets/pagemenu.cpp +++ b/src/webengine/widgets/pagemenu.cpp @@ -8,7 +8,7 @@ #include "pagemenu.h" #include "../webview.h" -#include "webengine/webprofile.h" +#include <webprofile.h> #include <QFileDialog> #include <QLabel> #include <QPrintDialog> |