diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index f3f3ba4..bcb7fea 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,7 +6,7 @@ "${workspaceFolder}/**", "${workspaceFolder}/build/_deps/kylin-src/Universal", "/opt/Libraries/boost_1_86_0/include", - "/opt/Libraries/wt-4.11.0/include", + "/opt/Libraries/wt-4.11.1/include", "/opt/Libraries/ZLMediaKit/include" ], "defines": [], diff --git a/WebApplication/Hello.cpp b/WebApplication/Hello.cpp index 59a564c..c54ba73 100644 --- a/WebApplication/Hello.cpp +++ b/WebApplication/Hello.cpp @@ -20,9 +20,9 @@ Hello::Hello(const Wt::WEnvironment &env, Wt::Dbo::SqlConnectionPool &connection m_session = std::make_unique(connectionPool); m_session->login().changed().connect(this, &Hello::authEvent); setTitle("Hello world"); - setTheme(std::make_shared()); Wt::WContainerWidget *top = nullptr; if (!embedded) { + setTheme(std::make_shared()); top = root(); } else { std::unique_ptr topPtr = std::make_unique(); @@ -62,7 +62,7 @@ Hello::Hello(const Wt::WEnvironment &env, Wt::Dbo::SqlConnectionPool &connection auto app = Amass::Singleton::instance(); auto authWidget = std::make_unique(app->authService(), m_session->users(), m_session->login()); - authWidget-> setInternalBasePath("/"); + authWidget->setInternalBasePath("/"); authWidget->model()->addPasswordAuth(&app->passwordService()); authWidget->setRegistrationEnabled(true); authWidget->processEnvironment(); diff --git a/resources/build.sh b/resources/build.sh index 5141233..fc1cc54 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -23,7 +23,7 @@ function cmake_scan() { function build() { # reset # pkill -9 HttpServer - # cp -r /opt/Libraries/wt-4.11.0/share/Wt/* ./build + # cp -r /opt/Libraries/wt-4.11.1/share/Wt/* ./build if [ ! -f "${build_path}/CMakeCache.txt" ]; then cmake_scan