diff --git a/CMakeLists.txt b/CMakeLists.txt index c3019e1..1f558aa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD 17) -find_package(Qt6 COMPONENTS Core Widgets Network CONFIG REQUIRED) +find_package(Qt5 COMPONENTS Core Widgets Network CONFIG REQUIRED) add_subdirectory(external) @@ -19,7 +19,7 @@ add_executable(xivlauncher src/settingswindow.cpp src/blowfish.cpp) -target_link_libraries(xivlauncher Qt6::Core Qt6::Widgets Qt6::Network qt6keychain) +target_link_libraries(xivlauncher Qt5::Core Qt5::Widgets Qt5::Network qt5keychain) # disgusting, thanks qtkeychain target_include_directories(xivlauncher PRIVATE diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index c84c545..7a18dbc 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -6,7 +6,7 @@ FetchContent_Declare( GIT_TAG v0.12.0 ) -set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE) +set(BUILD_WITH_QT6 OFF CACHE BOOL "" FORCE) set(QTKEYCHAIN_STATIC ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable(qtkeychain) \ No newline at end of file diff --git a/src/settingswindow.cpp b/src/settingswindow.cpp index d667576..dbd3595 100644 --- a/src/settingswindow.cpp +++ b/src/settingswindow.cpp @@ -64,7 +64,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window directXCombo->addItem("DirectX 9"); gameBoxLayout->addRow("DirectX Version", directXCombo); - connect(directXCombo, &QComboBox::currentIndexChanged, [=](int index) { + connect(directXCombo, static_cast(&QComboBox::currentIndexChanged), [=](int index) { getCurrentProfile().useDX9 = directXCombo->currentIndex() == 1; this->window.saveSettings(); }); @@ -109,7 +109,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window serverType->insertItem(0, "Square Enix"); serverType->insertItem(1, "Sapphire"); - connect(serverType, &QComboBox::currentIndexChanged, [=](int index) { + connect(serverType, static_cast(&QComboBox::currentIndexChanged), [=](int index) { getCurrentProfile().isSapphire = index == 1; reloadControls(); @@ -174,7 +174,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window selectWineButton = new QPushButton("Select Wine Executable"); wineBoxLayout->addWidget(selectWineButton); - connect(wineVersionCombo, &QComboBox::currentIndexChanged, [this](int index) { + connect(wineVersionCombo, static_cast(&QComboBox::currentIndexChanged), [this](int index) { getCurrentProfile().wineVersion = index; this->window.readWineInfo(getCurrentProfile()); diff --git a/src/xivlauncher.cpp b/src/xivlauncher.cpp index 16b5487..049ba6c 100755 --- a/src/xivlauncher.cpp +++ b/src/xivlauncher.cpp @@ -43,7 +43,7 @@ void LauncherWindow::setSSL(QNetworkRequest& request) { void LauncherWindow::buildRequest(QNetworkRequest& request) { setSSL(request); request.setHeader(QNetworkRequest::UserAgentHeader, - QString("SQEXAuthor/2.0.0(Windows 6.2; ja-jp; %1)").arg(QSysInfo::bootUniqueId())); + QString("SQEXAuthor/2.0.0(Windows 6.2; ja-jp; %1)").arg(QString(QSysInfo::bootUniqueId()))); request.setRawHeader("Accept", "image/gif, image/jpeg, image/pjpeg, application/x-ms-application, application/xaml+xml, application/x-ms-xbap, */*"); request.setRawHeader("Accept-Encoding", "gzip, deflate"); @@ -366,7 +366,7 @@ LauncherWindow::LauncherWindow(QWidget* parent) : auto layout = new QFormLayout(); profileSelect = new QComboBox(); - connect(profileSelect, &QComboBox::currentIndexChanged, [=](int index) { + connect(profileSelect, static_cast(&QComboBox::currentIndexChanged), [=](int index) { reloadControls(); }); diff --git a/src/xivlauncher.h b/src/xivlauncher.h index d7bf784..d2eea85 100755 --- a/src/xivlauncher.h +++ b/src/xivlauncher.h @@ -105,6 +105,6 @@ private: QCheckBox* rememberUsernameBox, *rememberPasswordBox; QPushButton* registerButton; - QList profileSettings; + QVector profileSettings; int defaultProfileIndex = 0; };