mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-25 03:15:44 -05:00
[libcalamaresui] Chase 3rdparty move
- Widgets need to #include from different path
This commit is contained in:
parent
2166eb4511
commit
c83e95e66a
3 changed files with 6 additions and 4 deletions
|
@ -2,7 +2,7 @@
|
|||
# view modules, view steps, widgets, and branding.
|
||||
|
||||
# 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
|
||||
modulesystem/CppJobModule.cpp
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "Branding.h"
|
||||
#include "modulesystem/Module.h"
|
||||
#include "modulesystem/ModuleManager.h"
|
||||
#include "utils/qjsonmodel.h"
|
||||
|
||||
#include "GlobalStorage.h"
|
||||
#include "Job.h"
|
||||
|
@ -31,11 +30,13 @@
|
|||
#include "utils/Logger.h"
|
||||
#include "utils/Retranslator.h"
|
||||
|
||||
#include "3rdparty/qjsonmodel.h"
|
||||
|
||||
#ifdef WITH_PYTHONQT
|
||||
#include <gui/PythonQtScriptingConsole.h>
|
||||
#include "ViewManager.h"
|
||||
#include "viewpages/PythonQtViewStep.h"
|
||||
|
||||
#include <gui/PythonQtScriptingConsole.h>
|
||||
#endif
|
||||
|
||||
#include <QJsonDocument>
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
#include "WaitingWidget.h"
|
||||
|
||||
#include "utils/CalamaresUtilsGui.h"
|
||||
#include "waitingspinnerwidget.h"
|
||||
|
||||
#include "3rdparty/waitingspinnerwidget.h"
|
||||
|
||||
#include <QBoxLayout>
|
||||
#include <QLabel>
|
||||
|
|
Loading…
Add table
Reference in a new issue