From 1bb6603998ef9606f0416a8b2dfc99eeffa8eeb4 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 21 Aug 2014 17:44:35 +0200
Subject: [PATCH] Move spinner widget to libcalamaresui.

---
 src/libcalamaresui/CMakeLists.txt                             | 2 ++
 .../locale => libcalamaresui/widgets}/QtWaitingSpinner.cpp    | 0
 .../locale => libcalamaresui/widgets}/QtWaitingSpinner.h      | 4 +++-
 src/modules/locale/CMakeLists.txt                             | 1 -
 src/modules/locale/LocaleViewStep.cpp                         | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename src/{modules/locale => libcalamaresui/widgets}/QtWaitingSpinner.cpp (100%)
 rename src/{modules/locale => libcalamaresui/widgets}/QtWaitingSpinner.h (96%)

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index f4838ae46..6ded069b0 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -12,6 +12,8 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES
     viewpages/AbstractPage.cpp
     viewpages/ViewStep.cpp
 
+    widgets/QtWaitingSpinner.cpp
+
     InstallationViewStep.cpp
     Settings.cpp
     ViewManager.cpp
diff --git a/src/modules/locale/QtWaitingSpinner.cpp b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
similarity index 100%
rename from src/modules/locale/QtWaitingSpinner.cpp
rename to src/libcalamaresui/widgets/QtWaitingSpinner.cpp
diff --git a/src/modules/locale/QtWaitingSpinner.h b/src/libcalamaresui/widgets/QtWaitingSpinner.h
similarity index 96%
rename from src/modules/locale/QtWaitingSpinner.h
rename to src/libcalamaresui/widgets/QtWaitingSpinner.h
index 5ab1ec808..77a7f6b68 100644
--- a/src/modules/locale/QtWaitingSpinner.h
+++ b/src/libcalamaresui/widgets/QtWaitingSpinner.h
@@ -22,12 +22,14 @@
 #ifndef QTWAITINGSPINNER_H
 #define QTWAITINGSPINNER_H
 
+#include "UiDllMacro.h"
+
 #include <QtCore/QTimer>
 
 #include <QWidget>
 #include <QColor>
 
-class QtWaitingSpinner : public QWidget {
+class UIDLLEXPORT QtWaitingSpinner : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index a84baf4f9..3fa6c00ce 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -6,7 +6,6 @@ calamares_add_plugin( locale
     SOURCES
         LocaleViewStep.cpp
         LocalePage.cpp
-        QtWaitingSpinner.cpp
         SetTimezoneJob.cpp
         timezonewidget/timezonewidget.cpp
         timezonewidget/localeglobal.cpp
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 1e8177f69..33780cd63 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -19,7 +19,7 @@
 #include "LocaleViewStep.h"
 
 #include "LocalePage.h"
-#include "QtWaitingSpinner.h"
+#include "widgets/QtWaitingSpinner.h"
 #include "timezonewidget/localeglobal.h"
 
 #include "utils/CalamaresUtilsGui.h"