diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 43 | ||||
-rw-r--r-- | src/about/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/about/aboutdialog.cpp | 6 | ||||
-rw-r--r-- | src/about/meson.build | 21 | ||||
-rw-r--r-- | src/about/test/main.cpp | 8 | ||||
-rw-r--r-- | src/applicationmenu.cpp | 2 | ||||
-rw-r--r-- | src/autogen/CMakeLists.txt | 31 | ||||
-rw-r--r-- | src/autogen/settings.h.in (renamed from src/settings.h.in) | 0 | ||||
-rw-r--r-- | src/autogen/version.h.in (renamed from src/version.h.in) | 11 | ||||
-rw-r--r-- | src/bookmarks/builtin.cpp | 1 | ||||
-rw-r--r-- | src/bookmarks/meson.build | 8 | ||||
-rw-r--r-- | src/browser.cpp | 11 | ||||
-rw-r--r-- | src/cmd/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/cmd/cmd.hpp | 4 | ||||
-rw-r--r-- | src/cmd/meson.build | 2 | ||||
-rw-r--r-- | src/configuration/meson.build | 1 | ||||
-rw-r--r-- | src/main.cpp | 8 | ||||
-rw-r--r-- | src/meson.build | 61 | ||||
-rw-r--r-- | src/session/meson.build | 1 | ||||
-rw-r--r-- | src/util.cpp | 3 | ||||
-rw-r--r-- | src/webengine/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/webengine/meson.build | 27 | ||||
-rw-r--r-- | src/webengine/test/profilemanager.cpp | 8 |
23 files changed, 141 insertions, 154 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..8754e54 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,43 @@ +add_subdirectory(autogen) +add_subdirectory(about) +add_subdirectory(cmd) +add_subdirectory(webengine) + +add_executable(poi + bookmarks/builtin.cpp + bookmarks/bookmarkswidget.h bookmarks/bookmarkswidget.cpp bookmarks/bookmarksform.ui + bookmarks/bookmarkstoolbar.h bookmarks/bookmarkstoolbar.cpp + bookmarks/editbookmarkdialog.h bookmarks/editbookmarkdialog.cpp bookmarks/editbookmarkdialog.ui + + cmd/cmd.hpp + configuration/builtin.cpp + + mainwindow/widgets/completer.h mainwindow/widgets/completer.cpp + mainwindow/widgets/dockwidget.h mainwindow/widgets/dockwidget.cpp + mainwindow/widgets/menusearch.h mainwindow/widgets/menusearch.cpp + mainwindow/widgets/navigationbar.h mainwindow/widgets/navigationbar.cpp + mainwindow/widgets/searchform.h mainwindow/widgets/searchform.cpp mainwindow/widgets/searchform.ui + mainwindow/widgets/urllineedit.h mainwindow/widgets/urllineedit.cpp + mainwindow/addressbar.h mainwindow/addressbar.cpp mainwindow/addressbar.ui + mainwindow/mainwindow.h mainwindow/mainwindow.cpp + mainwindow/menubar.h mainwindow/menubar.cpp + + session/builtin.cpp + session/savesessiondialog.h session/savesessiondialog.cpp session/savesessiondialog.ui + session/sessiondialog.h session/sessiondialog.cpp session/sessiondialog.ui + + subwindow/subwindow.h subwindow/subwindow.cpp + subwindow/tabwidget.h subwindow/tabwidget.cpp + + main.cpp + applicationmenu.h applicationmenu.cpp + browser.h browser.cpp + util.h util.cpp) + +target_link_libraries(poi PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::Svg + SingleApplication::SingleApplication fmt spdlog + about_dialog about_plugin webengine + bookmarks configuration downloads pluginloader session_formats smolblok) +target_include_directories(poi PRIVATE . + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/about/CMakeLists.txt b/src/about/CMakeLists.txt new file mode 100644 index 0000000..027d509 --- /dev/null +++ b/src/about/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(about_dialog INTERFACE) +target_sources(about_dialog INTERFACE aboutdialog.h aboutdialog.cpp aboutdialog.ui) +target_include_directories(about_dialog INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(about_dialog INTERFACE autogen Qt5::Widgets Qt5::Svg) + +add_library(about_plugin INTERFACE) +target_sources(about_plugin INTERFACE aboutplugin.h aboutplugin.cpp aboutplugin.ui) + +add_executable(test_about test/main.cpp) +target_link_libraries(test_about PRIVATE about_dialog Catch2::Catch2) +target_sanitize(test_about)
\ No newline at end of file diff --git a/src/about/aboutdialog.cpp b/src/about/aboutdialog.cpp index 6fa4127..643b87c 100644 --- a/src/about/aboutdialog.cpp +++ b/src/about/aboutdialog.cpp @@ -7,9 +7,9 @@ */ #include "aboutdialog.h" -#include "../poi_logos.h" +#include "poi_logos.h" #include "ui_aboutdialog.h" -#include <version.h> +#include "version.h" // compiler // clang also defines __GNUC__, so we need to check for clang first @@ -55,7 +55,7 @@ AboutDialog::AboutDialog(QWidget *parent) "<p>This program is distributed in the hope that it will be useful, but without any warranty.</p>" "<p>You can read the full terms of the license on <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>the GNU website</a>.</p>")); - ui->detailsLabel->setText(tr("<p>Version " poi_Version "</p>" + ui->detailsLabel->setText(tr("<p>Version " POI_VERSION "</p>" "<p>Compiled with " compiler "</p>" "<p>Libraries: <ul>" "<li><a href='https://www.qt.io/'>Qt5</a> " QT_VERSION_STR "</li>" diff --git a/src/about/meson.build b/src/about/meson.build deleted file mode 100644 index 49274a8..0000000 --- a/src/about/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -about_moc = mod_qt5.preprocess( - moc_headers: ['aboutdialog.h', 'aboutplugin.h'], - ui_files: ['aboutdialog.ui', 'aboutplugin.ui'], - dependencies: dep_qt5 -) - -dep_about = declare_dependency( - include_directories: '.', - link_with: static_library('about', - [ 'aboutdialog.cpp', 'aboutplugin.cpp', about_moc, version_h], - dependencies: [dep_qt5]) -) - -poi_sourceset.add(dep_about) - -test('about dialog', executable('about', - sources: 'test/main.cpp', - dependencies: [ dep_qt5, dep_about, dep_catch ]), - args: [ '-platform', 'offscreen' ], - env: 'autoclose=1' -) diff --git a/src/about/test/main.cpp b/src/about/test/main.cpp index 18037e1..1b71c8e 100644 --- a/src/about/test/main.cpp +++ b/src/about/test/main.cpp @@ -1,12 +1,13 @@ #include <QApplication> #include <QTimer> #include "aboutdialog.h" +#include "version.h" int main(int argc, char **argv) { QApplication app(argc, argv); - app.setApplicationName("about"); - app.setApplicationVersion("1.2.3"); + app.setApplicationName(POI_NAME); + app.setApplicationVersion(POI_SHORT_VERSION); AboutDialog dlg; QObject::connect(&dlg, &AboutDialog::finished, &app, &QApplication::quit); @@ -17,5 +18,4 @@ int main(int argc, char **argv) } return app.exec(); -} - +}
\ No newline at end of file diff --git a/src/applicationmenu.cpp b/src/applicationmenu.cpp index 112e790..f69260d 100644 --- a/src/applicationmenu.cpp +++ b/src/applicationmenu.cpp @@ -7,7 +7,7 @@ */ #include "applicationmenu.h" -#include "aboutdialog.h" +#include "about/aboutdialog.h" #include "browser.h" #include "configuration.h" #include "session/savesessiondialog.h" diff --git a/src/autogen/CMakeLists.txt b/src/autogen/CMakeLists.txt new file mode 100644 index 0000000..66065ee --- /dev/null +++ b/src/autogen/CMakeLists.txt @@ -0,0 +1,31 @@ +find_program(PYTHON python3) + +# version.h +configure_file(version.h.in version.h @ONLY) + +# settings.h +add_custom_command(OUTPUT settings.h DEPENDS settings.h.in + COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/scripts/gen-default-cfg.py + --kconfig=${CMAKE_SOURCE_DIR}/Kconfig --dotconfig=${CMAKE_SOURCE_DIR}/linux/.config + --input=${CMAKE_CURRENT_SOURCE_DIR}/settings.h.in --output=settings.h) + +# poi_logos.h +set(poi_logos ${CMAKE_SOURCE_DIR}/data/poi.svg ${CMAKE_SOURCE_DIR}/data/poi_window.svg) +add_custom_command(OUTPUT poi_logos.h DEPENDS ${poi_logos} + COMMAND ${PYTHON} ${RCC} -o=poi_logos.h dump -ns=logos ${poi_logos}) + +# poi_icons.h +set(poi_icons icons/arrow-left.svg icons/arrow-right.svg icons/circle-x.svg icons/refresh.svg icons/home.svg) +foreach(f ${poi_icons}) + list(REMOVE_ITEM poi_icons ${f}) + list(APPEND poi_icons ${ICONS_PATH}/${f}) +endforeach() +add_custom_command(OUTPUT poi_icons.h DEPENDS ${poi_icons} + COMMAND ${PYTHON} ${RCC} -o=poi_icons.h dump -ns=icons ${poi_icons}) + +# autogen target +add_custom_target(py_autogen DEPENDS settings.h poi_logos.h poi_icons.h) + +add_library(autogen INTERFACE) +target_include_directories(autogen INTERFACE ${CMAKE_CURRENT_BINARY_DIR}) +add_dependencies(autogen py_autogen) diff --git a/src/settings.h.in b/src/autogen/settings.h.in index 51b2bd0..51b2bd0 100644 --- a/src/settings.h.in +++ b/src/autogen/settings.h.in diff --git a/src/version.h.in b/src/autogen/version.h.in index 231fb7c..4d50885 100644 --- a/src/version.h.in +++ b/src/autogen/version.h.in @@ -9,8 +9,13 @@ #ifndef SMOLBOTE_VERSION_H #define SMOLBOTE_VERSION_H -// output of 'git describe --long --abbrev=40': -// x.y.z-0-g0123456789012345678901234567890123456789 -#define poi_Version "@VCS_TAG@" +/* + * This is an automatically generated file, any changes to it may be overwritten. + * Edit src/version.h.in instead. + */ + +#define POI_NAME "@CMAKE_PROJECT_NAME@" +#define POI_VERSION "@CMAKE_PROJECT_VERSION@" +#define POI_SHORT_VERSION "@CMAKE_PROJECT_SHORT_VERSION@" #endif // SMOLBOTE_VERSION_H diff --git a/src/bookmarks/builtin.cpp b/src/bookmarks/builtin.cpp index 1ef516b..b8b925c 100644 --- a/src/bookmarks/builtin.cpp +++ b/src/bookmarks/builtin.cpp @@ -11,7 +11,6 @@ #include "configuration.h" #include <QBuffer> #include <QCommandLineParser> -#include <QCoreApplication> #include <QFile> #include <cstdlib> #include <iostream> diff --git a/src/bookmarks/meson.build b/src/bookmarks/meson.build deleted file mode 100644 index 8fc93f0..0000000 --- a/src/bookmarks/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -poi_sourceset.add(files('builtin.cpp', - 'bookmarkswidget.cpp', 'editbookmarkdialog.cpp', 'bookmarkstoolbar.cpp'), -mod_qt5.preprocess( - moc_headers: ['bookmarkswidget.h', 'editbookmarkdialog.h'], - ui_files: ['bookmarksform.ui', 'editbookmarkdialog.ui'], - dependencies: dep_qt5 -)) - diff --git a/src/browser.cpp b/src/browser.cpp index b05c620..c9ed395 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -7,7 +7,7 @@ */ #include "browser.h" -#include "aboutplugin.h" +#include "about/aboutplugin.h" #include "applicationmenu.h" #include "bookmarks/bookmarkswidget.h" #include "configuration.h" @@ -17,18 +17,14 @@ #include "mainwindow/menubar.h" #include "session_json.hpp" #include "settings.h" -#include "smolbote/plugininterface.hpp" -#include "subwindow/subwindow.h" #include "util.h" #include "webengine/webprofile.h" #include "webengine/webprofilemanager.h" -#include "webengine/webview.h" #include <QAction> #include <QLibraryInfo> #include <QPluginLoader> #include <QTimer> #include <QTranslator> -#include <QVersionNumber> #include <pluginloader.h> #include <spdlog/spdlog.h> #include <version.h> @@ -36,10 +32,9 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary) : SingleApplication(argc, argv, allowSecondary, SingleApplication::User | SingleApplication::SecondaryNotification | SingleApplication::ExcludeAppVersion) { - //setApplicationName(conf.value<QString>("poi.name").value()); - setApplicationName("smolbote"); + setApplicationName(POI_NAME); setWindowIcon(Util::icon<Util::AppWindowIcon>()); - setApplicationVersion(QVersionNumber::fromString(QLatin1String(poi_Version)).toString()); + setApplicationVersion(POI_SHORT_VERSION); } Browser::~Browser() diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt new file mode 100644 index 0000000..31563c9 --- /dev/null +++ b/src/cmd/CMakeLists.txt @@ -0,0 +1,5 @@ +add_executable(cmd_test test.cpp) +target_link_libraries(cmd_test PRIVATE autogen Qt5::Core) +target_sanitize(cmd_test) + +add_test(NAME cmd_parser COMMAND cmd_test)
\ No newline at end of file diff --git a/src/cmd/cmd.hpp b/src/cmd/cmd.hpp index 37bb3ce..1aad060 100644 --- a/src/cmd/cmd.hpp +++ b/src/cmd/cmd.hpp @@ -24,7 +24,7 @@ using map = std::unordered_map<std::string, subcommand_fn<T>>; // a helper function to join the keys of a command_map into a string template <typename T> -[[nodiscard]] inline QString join_keys(const map<T> &map, const QString sep = ", ") +[[nodiscard]] inline QString join_keys(const map<T> &map, const QString &sep = ", ") { QString k; for(auto it = map.cbegin(); it != map.cend(); ++it) { @@ -59,7 +59,7 @@ template <typename T> parser.process(app); if(parser.isSet(build)) { - std::cout << app.applicationName().toStdString() << " " << poi_Version << std::endl; + std::cout << app.applicationName().toStdString() << " " << POI_VERSION << std::endl; exit(0); } diff --git a/src/cmd/meson.build b/src/cmd/meson.build deleted file mode 100644 index 466647f..0000000 --- a/src/cmd/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -test('command line parser', executable('cmd_test', ['test.cpp', version_h], dependencies: [ dep_qt5 ])) - diff --git a/src/configuration/meson.build b/src/configuration/meson.build deleted file mode 100644 index 5ba8ffd..0000000 --- a/src/configuration/meson.build +++ /dev/null @@ -1 +0,0 @@ -poi_sourceset.add(files('builtin.cpp')) diff --git a/src/main.cpp b/src/main.cpp index 135d0ee..65c8c26 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,10 +10,7 @@ #include "cmd/cmd.hpp" #include "configuration.h" #include "util.h" -#include <QFile> -#include <QPluginLoader> #include <QStandardPaths> -#include <pluginloader.h> #include <spdlog/spdlog.h> namespace builtins @@ -26,10 +23,11 @@ int sub_session(const QStringList &l, Browser &); int main(int argc, char **argv) { // spdlog pattern - if(const char *env_spdlog = std::getenv("POI_LOG_PATTERN")) + if(const char *env_spdlog = std::getenv("POI_LOG_PATTERN")) { spdlog::set_pattern(env_spdlog); - else + } else { spdlog::set_pattern("[%^%l%$] [%P:%t] %v"); + } #ifdef QT_DEBUG spdlog::set_level(spdlog::level::debug); // Set global log level to debug diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index 1529a95..0000000 --- a/src/meson.build +++ /dev/null @@ -1,61 +0,0 @@ -python = import('python') -python3 = python.find_installation('python3') - -rcc_exe = subproject('rcc').get_variable('rcc_exe') -icons = subproject('tabler-icons').get_variable('smolbote_icons') - -poi_settings_h = custom_target('default_config_value', - input: files('../scripts/gen-default-cfg.py', '../Kconfig', '..'/host_machine.system()/'.config', 'settings.h.in'), - output: 'settings.h', - command: [ python3, '@INPUT0@', '--kconfig=@INPUT1@', '--dotconfig=@INPUT2@', '--input=@INPUT3@', '--output=@OUTPUT@' ] -) - -poi_logos_h = custom_target('poi_logos_h', - input: files('../data/poi.svg', '../data/poi_window.svg'), - output: 'poi_logos.h', - command: [ python3, rcc_exe, '-o=@OUTPUT@', 'dump', '-ns=logos', '@INPUT@' ]) -poi_icons_h = custom_target('poi_icons_h', - input: icons, - output: 'poi_icons.h', - command: [ python3, rcc_exe, '-o=@OUTPUT@', 'dump', '-ns=icons', '@INPUT@' ]) - -subdir('about') -subdir('bookmarks') -subdir('configuration') -subdir('cmd') -subdir('session') -subdir('webengine') - -poi_sourceset.add(mod_qt5.preprocess( - moc_headers: ['browser.h', 'applicationmenu.h', - 'mainwindow/mainwindow.h', 'mainwindow/addressbar.h', 'mainwindow/menubar.h', 'mainwindow/widgets/completer.h', 'mainwindow/widgets/urllineedit.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h', - 'session/savesessiondialog.h', 'session/sessiondialog.h', - 'subwindow/subwindow.h', 'subwindow/tabwidget.h' ], - ui_files: [ - 'mainwindow/addressbar.ui', 'mainwindow/widgets/searchform.ui', - 'session/savesessiondialog.ui', 'session/sessiondialog.ui' ], - dependencies: dep_qt5 -)) - -poi_sourceset.add(files( - 'main.cpp', 'browser.cpp', 'applicationmenu.cpp', 'util.cpp', - - 'mainwindow/mainwindow.cpp', - 'mainwindow/addressbar.cpp', - 'mainwindow/menubar.cpp', - 'mainwindow/widgets/completer.cpp', - 'mainwindow/widgets/urllineedit.cpp', - 'mainwindow/widgets/dockwidget.cpp', - 'mainwindow/widgets/menusearch.cpp', - 'mainwindow/widgets/navigationbar.cpp', - 'mainwindow/widgets/searchform.cpp', - - 'session/savesessiondialog.cpp', - 'session/sessiondialog.cpp', - - 'subwindow/subwindow.cpp', - 'subwindow/tabwidget.cpp', -), - version_h, poi_settings_h, poi_icons_h, poi_logos_h -) - diff --git a/src/session/meson.build b/src/session/meson.build deleted file mode 100644 index 5ba8ffd..0000000 --- a/src/session/meson.build +++ /dev/null @@ -1 +0,0 @@ -poi_sourceset.add(files('builtin.cpp')) diff --git a/src/util.cpp b/src/util.cpp index 3dc5f8d..f18b682 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -16,8 +16,7 @@ const QStringList Util::files(const QString &location, const QStringList &nameFilters) { - if(location.isEmpty()) - return QStringList(); + if(location.isEmpty()) return QStringList(); QStringList filelist; diff --git a/src/webengine/CMakeLists.txt b/src/webengine/CMakeLists.txt new file mode 100644 index 0000000..5d2769d --- /dev/null +++ b/src/webengine/CMakeLists.txt @@ -0,0 +1,22 @@ +add_library(webengine INTERFACE) +target_sources(webengine INTERFACE + webprofile.h webprofile.cpp webprofilemanager.h webprofilemanager.cpp + webpage.h webpage.cpp + webview.h webview.cpp webviewcontextmenu.h webviewcontextmenu.cpp + urlinterceptor.h urlinterceptor.cpp) +target_include_directories(webengine INTERFACE ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(webengine INTERFACE Qt5::WebEngineWidgets fmt) + +# tests +add_executable(profile_test test/profile.cpp) +target_link_libraries(profile_test PRIVATE webengine Catch2::Catch2) +#target_sanitize(profile_test) + +add_executable(profilemanager_test test/profilemanager.cpp) +target_link_libraries(profilemanager_test PRIVATE webengine Catch2::Catch2) +#target_sanitize(profilemanager_test) + +add_test(NAME webengine_profile COMMAND profile_test) +add_test(NAME webengine_profilemanager COMMAND profilemanager_test) +set_tests_properties(webengine_profile webengine_profilemanager PROPERTIES + ENVIRONMENT "PROFILE=${CMAKE_CURRENT_SOURCE_DIR}/test/testing.profile")
\ No newline at end of file diff --git a/src/webengine/meson.build b/src/webengine/meson.build deleted file mode 100644 index da59006..0000000 --- a/src/webengine/meson.build +++ /dev/null @@ -1,27 +0,0 @@ -webengine_moc = mod_qt5.preprocess( - moc_headers: [ 'webprofile.h', 'webpage.h', 'webview.h' ], - dependencies: dep_qt5 -) - -dep_webengine = declare_dependency( - include_directories: [ '.', smolbote_include ], - link_with: static_library('webengine', dependencies: [ dep_qt5, dep_spdlog ], - include_directories: smolbote_include, - sources: [ 'webprofile.cpp', 'urlinterceptor.cpp', 'webprofilemanager.cpp', 'webpage.cpp', 'webview.cpp', 'webviewcontextmenu.cpp', webengine_moc ]) -) - -poi_sourceset.add(dep_webengine) - -test('profile', executable('profile', 'test/profile.cpp', dependencies: [ dep_qt5, dep_webengine, dep_catch ]), - env: { 'PROFILE' : meson.current_source_dir()/'test/testing.profile' }, - suite: 'webengine') - -test('profilemanager', executable('profilemanager', 'test/profilemanager.cpp', dependencies: [ dep_qt5, dep_webengine, dep_catch ]), - env: { 'PROFILES' : meson.current_source_dir()/'test/testing.profile' }, - suite: 'webengine') - -test('view', executable('view', 'test/view.cpp', dependencies: [ dep_qt5, dep_webengine, dep_catch ]), - #args: [ '-platform', 'offscreen' ], - env: { 'PROFILE' : meson.current_source_dir()/'test/testing.profile', - 'URL' : meson.current_source_dir()/'test/sample.html' }, - suite: 'webengine') diff --git a/src/webengine/test/profilemanager.cpp b/src/webengine/test/profilemanager.cpp index dc7c903..8f6a34f 100644 --- a/src/webengine/test/profilemanager.cpp +++ b/src/webengine/test/profilemanager.cpp @@ -60,9 +60,9 @@ SCENARIO("WebProfileManager") GIVEN("a number of profiles, default undefined") { - REQUIRE(qEnvironmentVariableIsSet("PROFILES")); + REQUIRE(qEnvironmentVariableIsSet("PROFILE")); - WebProfileManager<false> profiles(QString::fromLatin1(qgetenv("PROFILES")).split(';'), default_id, search, homepage, newtab); + WebProfileManager<false> profiles(QString::fromLatin1(qgetenv("PROFILE")).split(';'), default_id, search, homepage, newtab); REQUIRE(profiles.idList().count() == 2); REQUIRE(profiles.profile(default_id) == WebProfile::defaultProfile()); @@ -94,9 +94,9 @@ SCENARIO("WebProfileManager") GIVEN("a number of profiles, default defined") { - REQUIRE(qEnvironmentVariableIsSet("PROFILES")); + REQUIRE(qEnvironmentVariableIsSet("PROFILE")); - WebProfileManager<false> profiles(QString::fromLatin1(qgetenv("PROFILES")).split(';'), "testing", search, homepage, newtab); + WebProfileManager<false> profiles(QString::fromLatin1(qgetenv("PROFILE")).split(';'), "testing", search, homepage, newtab); REQUIRE(profiles.idList().count() == 1); REQUIRE(profiles.profile("testing") == WebProfile::defaultProfile()); |