[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:
parent
3bd610a838
commit
2ccd59e90b
@ -33,17 +33,12 @@ set( calamaresui_SOURCES
|
|||||||
widgets/LogWidget.cpp
|
widgets/LogWidget.cpp
|
||||||
widgets/TranslationFix.cpp
|
widgets/TranslationFix.cpp
|
||||||
widgets/WaitingWidget.cpp
|
widgets/WaitingWidget.cpp
|
||||||
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
|
widgets/waitingspinnerwidget.cpp
|
||||||
|
|
||||||
Branding.cpp
|
Branding.cpp
|
||||||
ViewManager.cpp
|
ViewManager.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
# Don't warn about third-party sources
|
|
||||||
mark_thirdparty_code(
|
|
||||||
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
if( WITH_PYTHON )
|
if( WITH_PYTHON )
|
||||||
list( APPEND calamaresui_SOURCES
|
list( APPEND calamaresui_SOURCES
|
||||||
modulesystem/PythonJobModule.cpp
|
modulesystem/PythonJobModule.cpp
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#ifndef WAITINGWIDGET_H
|
#ifndef WAITINGWIDGET_H
|
||||||
#define WAITINGWIDGET_H
|
#define WAITINGWIDGET_H
|
||||||
|
|
||||||
#include "3rdparty/waitingspinnerwidget.h"
|
#include "widgets/waitingspinnerwidget.h"
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include "ScanningDialog.h"
|
#include "ScanningDialog.h"
|
||||||
|
|
||||||
#include "3rdparty/waitingspinnerwidget.h"
|
#include "widgets/waitingspinnerwidget.h"
|
||||||
|
|
||||||
#include <QBoxLayout>
|
#include <QBoxLayout>
|
||||||
#include <QFutureWatcher>
|
#include <QFutureWatcher>
|
||||||
|
Loading…
Reference in New Issue
Block a user