[nostalgia] Port to Qt6
This commit is contained in:
@@ -53,7 +53,7 @@ add_executable(
|
||||
target_link_libraries(
|
||||
NostalgiaStudioJsonTest
|
||||
OxStd
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
add_test("[nostalgia/studio] NostalgiaStudioJson" NostalgiaStudioJsonTest)
|
||||
|
@@ -17,7 +17,7 @@ target_include_directories(NostalgiaStudio PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaStudio PUBLIC
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
OxFS
|
||||
OxClaw
|
||||
)
|
||||
|
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QQuickWindow>
|
||||
#include <ox/clargs/clargs.hpp>
|
||||
#include <ox/std/trace.hpp>
|
||||
#include <qdark/theme.hpp>
|
||||
@@ -17,18 +18,17 @@ using namespace nostalgia::studio;
|
||||
|
||||
int main(int argc, char **args) {
|
||||
ox::trace::init();
|
||||
// get profile path from command args
|
||||
ox::ClArgs clargs(argc, const_cast<const char**>(args));
|
||||
QString argProfilePath = clargs.getString("profile", ":/profiles/nostalgia-studio.json").c_str();
|
||||
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QApplication app(argc, args);
|
||||
|
||||
// load theme
|
||||
if constexpr(ox::defines::OS != ox::defines::OS::Darwin) {
|
||||
qdark::load(&app);
|
||||
}
|
||||
|
||||
// force QtQuick to use OpenGL (https://doc.qt.io/qt-6/quick-changes-qt6.html#changes-to-qquickwidget)
|
||||
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
|
||||
// open window
|
||||
try {
|
||||
MainWindow w(argProfilePath);
|
||||
app.setApplicationName(w.windowTitle());
|
||||
|
@@ -8,7 +8,6 @@
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QDesktopWidget>
|
||||
#include <QDialog>
|
||||
#include <QFileDialog>
|
||||
#include <QGridLayout>
|
||||
|
Reference in New Issue
Block a user