parent
096108ce2f
commit
9731409631
1
.gitignore
vendored
1
.gitignore
vendored
@ -89,6 +89,7 @@ m4/lt~obsolete.m4
|
||||
Makefile
|
||||
*.deps
|
||||
.dirstamp
|
||||
*-build/*
|
||||
bin/*
|
||||
build/*
|
||||
release/*
|
||||
|
@ -138,7 +138,8 @@ if(USE_BOOST_STACKTRACE)
|
||||
endif()
|
||||
#@}
|
||||
#@{ QT5 Dependency detection & tool setup
|
||||
find_package(Qt5 COMPONENTS
|
||||
find_package(Qt6
|
||||
COMPONENTS
|
||||
Core REQUIRED
|
||||
Widgets REQUIRED
|
||||
Gui REQUIRED
|
||||
|
@ -25,7 +25,7 @@ target_link_libraries(object-editor PRIVATE
|
||||
framework-core
|
||||
Catch2::Catch2WithMain
|
||||
FakeIt::FakeIt-catch
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Gui
|
||||
)
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include "EntityEditor.hpp"
|
||||
#include "EntityEditor.ui.hpp"
|
||||
#include "ui_EntityEditor.h"
|
||||
|
||||
#include "src/game/ComponentStore.hpp"
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "editors/object-editor/EntityEditor.ui.hpp"
|
||||
#include "ui_EntityEditor.h"
|
||||
#include <QFrame>
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
|
@ -18,7 +18,6 @@
|
||||
|
||||
#include <QResizeEvent>
|
||||
|
||||
#include <QDesktopWidget>
|
||||
#include <QScreen>
|
||||
|
||||
#include <QApplication>
|
||||
@ -35,7 +34,7 @@
|
||||
|
||||
#include "EntityEditor.hpp"
|
||||
#include "MainWindow.hpp"
|
||||
#include "MainWindow.ui.hpp"
|
||||
#include "ui_MainWindow.h"
|
||||
|
||||
#include "framework/framework.hpp"
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <QMainWindow>
|
||||
#include <QStringListModel>
|
||||
|
||||
#include "MainWindow.ui.hpp"
|
||||
#include "ui_MainWindow.h"
|
||||
|
||||
#include "game/ComponentStore.hpp"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user