[libcalamaresui] Move waitingspinnerwidget.* into calamaresui

Although this is 3rd-party code, it now diverges -- by merging the
stale PR from upstream, and from adding features of our own --
enough that we should not pretend that it is the original 3rdparty
code.

Chase a couple of include paths that called this from 3rdparty/
This commit is contained in:
Adriaan de Groot 2022-04-16 11:59:31 +02:00
parent 3bd610a838
commit 2ccd59e90b
5 changed files with 3 additions and 8 deletions

View File

@ -33,17 +33,12 @@ set( calamaresui_SOURCES
widgets/LogWidget.cpp
widgets/TranslationFix.cpp
widgets/WaitingWidget.cpp
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
widgets/waitingspinnerwidget.cpp
Branding.cpp
ViewManager.cpp
)
# Don't warn about third-party sources
mark_thirdparty_code(
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
)
if( WITH_PYTHON )
list( APPEND calamaresui_SOURCES
modulesystem/PythonJobModule.cpp

View File

@ -10,7 +10,7 @@
#ifndef WAITINGWIDGET_H
#define WAITINGWIDGET_H
#include "3rdparty/waitingspinnerwidget.h"
#include "widgets/waitingspinnerwidget.h"
#include <chrono>
#include <memory>

View File

@ -10,7 +10,7 @@
#include "ScanningDialog.h"
#include "3rdparty/waitingspinnerwidget.h"
#include "widgets/waitingspinnerwidget.h"
#include <QBoxLayout>
#include <QFutureWatcher>