[libcalamaresui] Chase 3rdparty move

- Widgets need to #include from different path
This commit is contained in:
Adriaan de Groot 2019-08-08 12:42:02 -04:00
parent 2166eb4511
commit c83e95e66a
3 changed files with 6 additions and 4 deletions

View File

@ -2,7 +2,7 @@
# view modules, view steps, widgets, and branding. # view modules, view steps, widgets, and branding.
# The UI libs use the non-UI library # The UI libs use the non-UI library
include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ) include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ${CMAKE_SOURCE_DIR} )
set( calamaresui_SOURCES set( calamaresui_SOURCES
modulesystem/CppJobModule.cpp modulesystem/CppJobModule.cpp

View File

@ -23,7 +23,6 @@
#include "Branding.h" #include "Branding.h"
#include "modulesystem/Module.h" #include "modulesystem/Module.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "utils/qjsonmodel.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "Job.h" #include "Job.h"
@ -31,11 +30,13 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "3rdparty/qjsonmodel.h"
#ifdef WITH_PYTHONQT #ifdef WITH_PYTHONQT
#include <gui/PythonQtScriptingConsole.h>
#include "ViewManager.h" #include "ViewManager.h"
#include "viewpages/PythonQtViewStep.h" #include "viewpages/PythonQtViewStep.h"
#include <gui/PythonQtScriptingConsole.h>
#endif #endif
#include <QJsonDocument> #include <QJsonDocument>

View File

@ -20,7 +20,8 @@
#include "WaitingWidget.h" #include "WaitingWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "waitingspinnerwidget.h"
#include "3rdparty/waitingspinnerwidget.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>