don't use static lib for newwizard

Fixes linking inkonsitencies

Author: TheOneRing

src/gui/CMakeLists.txt

@@ -98,7 +98,7 @@ target_include_directories(OpenCloudGui PRIVATE models spaces creds)
 target_link_libraries(OpenCloudGui
     PUBLIC
         Qt::Widgets Qt::Network Qt::Xml Qt::Quick Qt::QuickWidgets Qt::QuickControls2
-        newwizard folderwizard
+        folderwizard
         libsync
         Qt6Keychain::Qt6Keychain
 )

src/gui/newwizard/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(newwizard STATIC
+target_sources(OpenCloudGui PRIVATE
     enums.cpp
 
     pages/abstractsetupwizardpage.h
@@ -46,7 +46,3 @@ add_library(newwizard STATIC
 
     setupwizardcontext.cpp
 )
-target_link_libraries(newwizard PUBLIC Qt::Widgets libsync OpenCloudResources)
-set_target_properties(newwizard PROPERTIES AUTOUIC ON AUTORCC ON)
-target_include_directories(newwizard PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-apply_common_target_settings(newwizard)

src/gui/newwizard/pages/accountconfiguredwizardpage.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "abstractsetupwizardpage.h"
-#include "setupwizardcontroller.h"
+#include "gui/newwizard/pages/abstractsetupwizardpage.h"
+#include "gui/newwizard/setupwizardcontroller.h"
 
 namespace Ui {
 class AccountConfiguredWizardPage;

src/gui/newwizard/pages/serverurlsetupwizardpage.cpp

@@ -1,5 +1,5 @@
-#include "serverurlsetupwizardpage.h"
-#include "ui_serverurlsetupwizardpage.h"
+#include "gui/newwizard/pages/serverurlsetupwizardpage.h"
+#include "gui/newwizard/ui_serverurlsetupwizardpage.h"
 
 #include "libsync/globalconfig.h"
 #include "libsync/theme.h"

src/gui/newwizard/states/abstractsetupwizardstate.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "enums.h"
-#include "pages/abstractsetupwizardpage.h"
-#include "setupwizardcontext.h"
+#include "gui/newwizard/enums.h"
+#include "gui/newwizard/pages/abstractsetupwizardpage.h"
+#include "gui/newwizard/setupwizardcontext.h"
 
 namespace OCC::Wizard {
 

src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp

@@ -12,11 +12,10 @@
  * for more details.
  */
 
-#include "accountconfiguredsetupwizardstate.h"
+#include "gui/newwizard/states/accountconfiguredsetupwizardstate.h"
 #include "gui/folderman.h"
+#include "gui/newwizard/pages/accountconfiguredwizardpage.h"
 #include "libsync/filesystem.h"
-#include "pages/accountconfiguredwizardpage.h"
-#include "theme.h"
 
 namespace OCC::Wizard {
 

src/gui/newwizard/states/oauthcredentialssetupwizardstate.cpp

@@ -12,9 +12,9 @@
  * for more details.
  */
 
-#include "oauthcredentialssetupwizardstate.h"
-
-#include "jobs/webfingeruserinfojobfactory.h"
+#include "gui/newwizard/states/oauthcredentialssetupwizardstate.h"
+#include "gui/newwizard/jobs/webfingeruserinfojobfactory.h"
+#include "gui/newwizard/pages/oauthcredentialssetupwizardpage.h"
 
 namespace OCC::Wizard {
 

src/gui/newwizard/states/oauthcredentialssetupwizardstate.h

@@ -14,8 +14,7 @@
 
 #pragma once
 
-#include "abstractsetupwizardstate.h"
-#include "pages/oauthcredentialssetupwizardpage.h"
+#include "gui/newwizard/states/abstractsetupwizardstate.h"
 
 namespace OCC::Wizard {
 

src/gui/newwizard/states/serverurlsetupwizardstate.cpp

@@ -16,6 +16,7 @@
 
 #include "gui/newwizard/jobs/discoverwebfingerservicejobfactory.h"
 #include "gui/newwizard/jobs/resolveurljobfactory.h"
+#include "gui/newwizard/pages/serverurlsetupwizardpage.h"
 #include "libsync/theme.h"
 
 namespace OCC::Wizard {

src/gui/newwizard/states/serverurlsetupwizardstate.h

@@ -14,8 +14,7 @@
 
 #pragma once
 
-#include "abstractsetupwizardstate.h"
-#include "pages/serverurlsetupwizardpage.h"
+#include "gui/newwizard/states/abstractsetupwizardstate.h"
 
 namespace OCC::Wizard {