Qt6

THIRDPARTY

@@ -1,4 +1,4 @@
-Qt 5.9 is licensed under the GNU Lesser General Public License, version 3
+Qt 6.11 is licensed under the GNU Lesser General Public License, version 3
 
    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -178,11 +178,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -------------------------------
 
-libcurl 7.64.0
+libcurl 8.21.0
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2019, Daniel Stenberg, <daniel@haxx.se>, and many
+Copyright (c) 1996 - 2026, Daniel Stenberg, <daniel@haxx.se>, and many
 contributors, see the THANKS file.
 
 All rights reserved.

realboot.pro

@@ -11,27 +11,9 @@ CONFIG += force_debug_info
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 
-# This crap lets us run files with the same name, in the same project, through moc, without conflicts.
-# Good idea? Probably not.
-
 CONFIG += object_parallel_to_source
 CONFIG += no_batch # above doesn't properly work with nmake without this
 
-defineReplace(fnPath) {
-    variable = $$1
-    variable = $$replace(variable, $$basename(variable), "")
-    variable = $$replace(variable, "\\\\", "_")
-    variable = $$replace(variable, "\.", "_")
-    variable = $$replace(variable, "/", "_")
-    return($$variable)
-}
-
-QMAKE_H_MOD_MOC = moc_${QMAKE_FUNC_fnPath}
-QMAKE_CPP_MOD_MOC = moc_${QMAKE_FUNC_fnPath}
-QMAKE_MOD_RCC = qrc${QMAKE_FUNC_fnPath}
-
-# But I'm going with it anyway.
-
 include(kofuna/kofuna.pri)
 
 chaosheadnoah {
@@ -92,7 +74,7 @@ steam {
 
 DEFINES += WIN32_LEAN_AND_MEAN
 INCLUDEPATH += $$(DXSDK_DIR)/include vendor/curl/include
-LIBS += $$quote(-L$$PWD/vendor/curl/lib) libcurl.lib $$quote(-L$$(DXSDK_DIR)/lib/x86) dinput8.lib dxguid.lib Shell32.lib Ole32.lib OleAut32.lib
+LIBS += $$quote(-L$$PWD/vendor/curl/lib) libcurl.lib $$quote(-L$$(DXSDK_DIR)/lib/x64) dinput8.lib dxguid.lib Shell32.lib Ole32.lib OleAut32.lib
 
 INCLUDEPATH += $$PWD/vendor/lua/src
 SOURCES += $$files($$PWD/vendor/lua/src/*.c, true)
@@ -109,4 +91,4 @@ HEADERS += $$files(src/*.h, true)
 FORMS += $$files(src/*.ui, true)
 
 RESOURCES += \
-    main.qrc
+    main.qrc

src/btnrow.h

@@ -18,7 +18,7 @@ class BtnRow : public QWidget {
         _bind = bind;
         QHBoxLayout *lay = new QHBoxLayout;
         lay->setSpacing(0);
-        lay->setMargin(0);
+        lay->setContentsMargins(0, 0, 0, 0);
         lay->setAlignment(Qt::AlignVCenter);
         QLabel *lbl = new QLabel(bindLabelTexts[bind]);
         lay->addWidget(lbl);
@@ -35,4 +35,4 @@ class BtnRow : public QWidget {
    private:
     ControllerConfig::Bind _bind;
     BtnLineEdit *_le;
-};
+};

src/controllertab.cpp

@@ -41,12 +41,12 @@ QString buttonToText(ControllerConfig::Button btn) {
 ControllerTab::ControllerTab(QWidget *parent) : QWidget(parent) {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setSpacing(12);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
     QHBoxLayout *controllerRow = new QHBoxLayout(this);
     controllerRow->setSpacing(8);
-    controllerRow->setMargin(0);
+    controllerRow->setContentsMargins(0, 0, 0, 0);
     controllerRow->setAlignment(Qt::AlignVCenter);
 
     _controllerCb = new QCheckBox("Enabled", this);
@@ -94,7 +94,7 @@ ControllerTab::ControllerTab(QWidget *parent) : QWidget(parent) {
 
         QHBoxLayout *btnsLayout = new QHBoxLayout(this);
         btnsLayout->setSpacing(12);
-        btnsLayout->setMargin(0);
+        btnsLayout->setContentsMargins(0, 0, 0, 0);
         mainLayout->addLayout(btnsLayout);
 
         int rightNum = (int)ControllerConfig::Bind::Num / 2;
@@ -104,7 +104,7 @@ ControllerTab::ControllerTab(QWidget *parent) : QWidget(parent) {
         leftCol->setSizePolicy(spCol);
         QVBoxLayout *leftColLayout = new QVBoxLayout(leftCol);
         leftColLayout->setSpacing(12);
-        leftColLayout->setMargin(0);
+        leftColLayout->setContentsMargins(0, 0, 0, 0);
         leftCol->setLayout(leftColLayout);
 
         for (int i = 0; i < leftNum; i++) {
@@ -118,7 +118,7 @@ ControllerTab::ControllerTab(QWidget *parent) : QWidget(parent) {
         rightCol->setSizePolicy(spCol);
         QVBoxLayout *rightColLayout = new QVBoxLayout(rightCol);
         rightColLayout->setSpacing(12);
-        rightColLayout->setMargin(0);
+        rightColLayout->setContentsMargins(0, 0, 0, 0);
         rightCol->setLayout(rightColLayout);
 
         for (int i = leftNum; i < leftNum + rightNum; i++) {
@@ -269,4 +269,4 @@ void ControllerTab::onButtonPressed(ControllerConfig::Button button) {
         int nextBind = ((int)br->bind() + 1) % (int)ControllerConfig::Bind::Num;
         _binds[nextBind]->le()->setFocus();
     }
-}
+}

src/dxvktab.cpp

@@ -22,7 +22,7 @@
 DxvkTab::DxvkTab(QWidget *parent) : QWidget(parent) {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setSpacing(8);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
     mainLayout->addSpacing(8);

src/generaltab.cpp

@@ -12,14 +12,14 @@ GeneralTab::GeneralTab(QWidget *parent) : QWidget(parent) {
 #if !defined(GAME_STEINSGATEVSO)
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setSpacing(8);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
     mainLayout->addSpacing(8);
 
     QHBoxLayout *resolutionRow = new QHBoxLayout(this);
     resolutionRow->setSpacing(8);
-    resolutionRow->setMargin(0);
+    resolutionRow->setContentsMargins(0, 0, 0, 0);
     QLabel *resolutionLabel = new QLabel("Resolution:", this);
     resolutionRow->addWidget(resolutionLabel);
     _resolutionComboBox = new QComboBox(this);
@@ -44,7 +44,7 @@ GeneralTab::GeneralTab(QWidget *parent) : QWidget(parent) {
 #if defined(GAME_CHAOSHEADNOAH)
     QHBoxLayout *languageRow = new QHBoxLayout(this);
     languageRow->setSpacing(8);
-    languageRow->setMargin(0);
+    languageRow->setContentsMargins(0, 0, 0, 0);
     QLabel *languageLabel = new QLabel("Language:", this);
     languageRow->addWidget(languageLabel);
     _languageGroup = new QButtonGroup(this);
@@ -108,7 +108,7 @@ GeneralTab::GeneralTab(QWidget *parent) : QWidget(parent) {
 
     QHBoxLayout *movieQualityRow = new QHBoxLayout(this);
     movieQualityRow->setSpacing(8);
-    movieQualityRow->setMargin(0);
+    movieQualityRow->setContentsMargins(0, 0, 0, 0);
     QLabel *movieQualityLabel = new QLabel("Quality:", this);
     movieQualityRow->addWidget(movieQualityLabel);
     _movieQualityGroup = new QButtonGroup(this);
@@ -127,7 +127,7 @@ GeneralTab::GeneralTab(QWidget *parent) : QWidget(parent) {
 #if !defined(GAME_STEINSGATEVSO) && !defined(GAME_ANONYMOUSCODE)
     QHBoxLayout *songSubsRow = new QHBoxLayout(this);
     songSubsRow->setSpacing(8);
-    songSubsRow->setMargin(0);
+    songSubsRow->setContentsMargins(0, 0, 0, 0);
     QLabel *songSubsLabel = new QLabel("Song subtitles:", this);
     songSubsRow->addWidget(songSubsLabel);
     _songSubsComboBox = new QComboBox(this);
@@ -273,5 +273,4 @@ void GeneralTab::reloadData() {
     !defined(GAME_ROBOTICSNOTESDASH) && !defined(GAME_ANONYMOUSCODE)
     _hqAudioCb->setChecked(rbApp->patchConfig()->hqFmvAudio);
 #endif
-#endif
-}
+}

src/launcherapplication.cpp

@@ -20,16 +20,14 @@ LauncherApplication::LauncherApplication(int& argc, char** argv)
     cm = new ControllerManager(this);
     w = new LauncherWindow(0);
 
-    // I would *like* to apply the style to the whole application
-    // (for unparented MessageBoxes), but that breaks the X button image...
-    w->setStyle(QStyleFactory::create("windows"));
+    setStyle(QStyleFactory::create("windows"));
     QFile qssFile(":/kofuna/style.qss");
     qssFile.open(QFile::ReadOnly | QFile::Text);
     QTextStream ts(&qssFile);
     QFile qssFile2(":/assets/realboot.qss");
     qssFile2.open(QFile::ReadOnly | QFile::Text);
     QTextStream ts2(&qssFile2);
-    w->setStyleSheet(ts.readAll() + ts2.readAll());
+    setStyleSheet(ts.readAll() + ts2.readAll());
 
     w->show();
     w->afterShow();
@@ -63,4 +61,4 @@ QString LauncherApplication::patchConfigDirectory() const {
 #endif
 }
 
-void LauncherApplication::showWindow() { w->show(); }
+void LauncherApplication::showWindow() { w->show(); }

src/launcherwindow.cpp

@@ -16,6 +16,7 @@
 #include <QProcess>
 #include <QElapsedTimer>
 #include <QMessageBox>
+#include <QIcon>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
@@ -100,11 +101,15 @@ LauncherWindow::LauncherWindow(QWidget *parent)
     // widgets while passing through input events that don't hit any of its
     // child widgets
     QToolButton *crossButton = new QToolButton(this);
+    QIcon crossIcon;
+    crossIcon.addFile(":/assets/cross.png", QSize(18, 18), QIcon::Normal);
+    crossIcon.addFile(":/assets/cross_hover.png", QSize(18, 18), QIcon::Active);
+    crossButton->setIcon(crossIcon);
+    crossButton->setIconSize(QSize(18, 18));
     crossButton->setStyleSheet(
-        "QToolButton { image: url(':/assets/cross.png'); }"
-        "QToolButton:hover { image: url(':/assets/cross_hover.png'); }");
+        "QToolButton { background: transparent; border: 0; padding: 0; }");
     crossButton->setCursor(QCursor(Qt::PointingHandCursor));
-    crossButton->resize(18, 18);
+    crossButton->setFixedSize(18, 18);
     crossButton->move(width() - (crossButton->width() + 12), 12);
     connect(crossButton, &QAbstractButton::clicked, this,
             &LauncherWindow::cancelRequested);
@@ -553,4 +558,4 @@ void LauncherWindow::updateCheckReplyReceived(const UpdateCheckReply &reply) {
             ui->updateCheckLabel->setText("(latest version)");
         }
     }
-}
+}

src/minisettingswidget.cpp

@@ -11,14 +11,14 @@ MiniSettingsWidget::MiniSettingsWidget(QWidget *parent) : QWidget(parent) {
 #if !defined(GAME_STEINSGATEVSO)
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setSpacing(8);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
     mainLayout->addSpacing(8);
 
     QHBoxLayout *resolutionRow = new QHBoxLayout(this);
     resolutionRow->setSpacing(8);
-    resolutionRow->setMargin(0);
+    resolutionRow->setContentsMargins(0, 0, 0, 0);
     resolutionRow->addStretch(1);
     QLabel *resolutionLabel = new QLabel("Resolution:", this);
     resolutionRow->addWidget(resolutionLabel);
@@ -44,7 +44,7 @@ MiniSettingsWidget::MiniSettingsWidget(QWidget *parent) : QWidget(parent) {
 #if defined(GAME_CHAOSHEADNOAH)
     QHBoxLayout *languageRow = new QHBoxLayout(this);
     languageRow->setSpacing(8);
-    languageRow->setMargin(0);
+    languageRow->setContentsMargins(0, 0, 0, 0);
     languageRow->addStretch(1);
     QLabel *languageLabel = new QLabel("Language:", this);
     languageRow->addWidget(languageLabel);
@@ -66,7 +66,7 @@ MiniSettingsWidget::MiniSettingsWidget(QWidget *parent) : QWidget(parent) {
     !defined(GAME_ROBOTICSNOTESDASH) && !defined(GAME_ANONYMOUSCODE)
     QHBoxLayout *movieQualityRow = new QHBoxLayout(this);
     movieQualityRow->setSpacing(8);
-    movieQualityRow->setMargin(0);
+    movieQualityRow->setContentsMargins(0, 0, 0, 0);
     movieQualityRow->addStretch(1);
     QLabel *movieQualityLabel = new QLabel("Video Quality:", this);
     movieQualityRow->addWidget(movieQualityLabel);
@@ -124,5 +124,4 @@ void MiniSettingsWidget::reloadData() {
     _languageGroup->button((int)rbApp->gameConfig()->language)
         ->setChecked(true);
 #endif
-#endif
-}
+}

src/troubleshootingtab.cpp

@@ -16,13 +16,16 @@
 #include <QSizePolicy>
 #include <QTextStream>
 #include <QProcess>
+#include <QOpenGLContext>
+#include <QOffscreenSurface>
+#include <QOpenGLFunctions>
 
 #include <windows.h>
 
 TroubleshootingTab::TroubleshootingTab(QWidget *parent) : QWidget(parent) {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setSpacing(8);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
     mainLayout->addSpacing(12);
@@ -67,7 +70,32 @@ TroubleshootingTab::TroubleshootingTab(QWidget *parent) : QWidget(parent) {
     QString troubleshootingData = "";
     troubleshootingData +=
         "Operating System: " + QSysInfo::prettyProductName() + " (" +
-        QSysInfo::kernelVersion() + ")\n";
+            QSysInfo::kernelType() + " " + QSysInfo::kernelVersion() + ")\n";
+    troubleshootingData +=
+        "CPU Architecture: " + QSysInfo::buildCpuArchitecture() + "\n";
+
+    QString gpuInfo;
+
+    QOpenGLContext context;
+    context.create();
+
+    QOffscreenSurface surface;
+    surface.create();
+
+    context.makeCurrent(&surface);
+
+    QOpenGLFunctions *f = context.functions();
+    const GLubyte *vendor   = f->glGetString(GL_VENDOR);
+    const GLubyte *renderer = f->glGetString(GL_RENDERER);
+    const GLubyte *version  = f->glGetString(GL_VERSION);
+
+    gpuInfo += "GPU Vendor: " + QString::fromLatin1(reinterpret_cast<const char*>(vendor)) + "\n";
+    gpuInfo += "GPU Renderer: " + QString::fromLatin1(reinterpret_cast<const char*>(renderer)) + "\n";
+    gpuInfo += "OpenGL Version: " + QString::fromLatin1(reinterpret_cast<const char*>(version)) + "\n";
+
+    context.doneCurrent();
+
+    troubleshootingData += gpuInfo;
 
     QString wine = "Not detected\n";
     typedef const char *(__cdecl * wine_info_proc)();
@@ -172,7 +200,7 @@ TroubleshootingTab::TroubleshootingTab(QWidget *parent) : QWidget(parent) {
     QFile launcherdiag(rbApp->patchConfigDirectory() + "/launcherdiag.txt");
     if (launcherdiag.open(QFile::WriteOnly)) {
         QTextStream launcherdiagOut(&launcherdiag);
-        launcherdiagOut << troubleshootingData << endl;
+        launcherdiagOut << troubleshootingData << Qt::endl;
     }
     QProcess::startDetached(
         "dxdiag", QStringList()

vendor/curl/COPYING

@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2019, Daniel Stenberg, <daniel@haxx.se>, and many
+Copyright (c) 1996 - 2026, Daniel Stenberg, <daniel@haxx.se>, and many
 contributors, see the THANKS file.
 
 All rights reserved.