don't use static lib for folderwizard

Fixes linking inkonsitencies

Author: TheOneRing

src/gui/CMakeLists.txt

@@ -98,7 +98,6 @@ 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
-        folderwizard
         libsync
         Qt6Keychain::Qt6Keychain
 )

src/gui/folderwizard/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(folderwizard STATIC
+target_sources(OpenCloudGui PRIVATE
     folderwizard.cpp
     folderwizardlocalpath.cpp
     folderwizardsourcepage.ui
@@ -10,7 +10,3 @@ add_library(folderwizard STATIC
     spacespage.cpp
     spacespage.ui
 )
-
-target_link_libraries(folderwizard PUBLIC Qt::Widgets libsync OpenCloudResources)
-set_target_properties(folderwizard PROPERTIES AUTOUIC ON AUTORCC ON)
-apply_common_target_settings(folderwizard)

src/gui/folderwizard/spacespage.h

@@ -39,7 +39,7 @@ class SpacesPage : public QWizardPage
     GraphApi::Space *currentSpace() const;
 
 private:
-    Ui::SpacesPage *ui;
+    ::Ui::SpacesPage *ui;
 };
 
 }

src/gui/newwizard/navigation.cpp

@@ -1,4 +1,4 @@
-#include "navigation.h"
+#include "gui/newwizard/navigation.h"
 
 #include <QHBoxLayout>
 #include <QRadioButton>

src/gui/newwizard/setupwizardwidget.ui

@@ -81,7 +81,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../../resources/client.qrc">:/client/resources/light/warning.svg</pixmap>
+           <pixmap>:/client/resources/light/warning.svg</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -91,7 +91,7 @@
         <item>
          <widget class="QLabel" name="errorMessageLabel">
           <property name="textFormat">
-           <enum>Qt::RichText</enum>
+           <enum>Qt::TextFormat::RichText</enum>
           </property>
          </widget>
         </item>
@@ -120,7 +120,7 @@
        <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -136,7 +136,7 @@
        <item>
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -170,7 +170,7 @@
   <customwidget>
    <class>OCC::Wizard::Navigation</class>
    <extends>QWidget</extends>
-   <header>navigation.h</header>
+   <header>gui/newwizard/navigation.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -180,8 +180,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../../resources/client.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>