From 158050cb33593efd123035462950291c8b07ac0a Mon Sep 17 00:00:00 2001 From: Sclafus Date: Sun, 18 Jun 2023 11:57:36 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=AA=A9=20main:=20added=20check=20for?= =?UTF-8?q?=20linux=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 74c4790..e3b2ab3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,8 +8,9 @@ int main(int argc, char **argv) { app.setOrganizationName("miraya"); app.setOrganizationDomain("github.com/MirayaProject"); app.setApplicationName("bot"); - app.setApplicationVersion("1.2.0-alpha.4"); - app.setWindowIcon(QIcon(":/resources/logo/logo.png")); + #ifdef Q_OS_LINUX + app.setWindowIcon(QIcon(":/resources/logo/logo.png")); + #endif MainWindow mw; mw.show(); return app.exec(); From 52cee8ef4e293b4f00821e6b9f5e57cdb44ffb81 Mon Sep 17 00:00:00 2001 From: Sclafus Date: Sun, 18 Jun 2023 11:58:33 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9A=AB=20cmake:=20v1.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c3aadf..a092420 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -project(miraya VERSION 1.1.0 LANGUAGES CXX) +project(miraya VERSION 1.2.0 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(COMPANY "MirayaOSU") -set(IDENTIFIER "com.github.mirayaosu") +set(COMPANY "MirayaProject") +set(IDENTIFIER "com.github.MirayaProject") find_package(Qt6 REQUIRED COMPONENTS Core Widgets WebSockets Network) qt_standard_project_setup() @@ -27,20 +27,22 @@ set(SOURCE_THEME_DIR "${CMAKE_SOURCE_DIR}/src/theme") set(SOURCE_ABOUT_DIR "${CMAKE_SOURCE_DIR}/src/about") -include_directories(${FORMS_DIR}) -include_directories(${SOURCE_DIR}) -include_directories(${SOURCE_TWITCH_DIR}) -include_directories(${SOURCE_GOSU_DIR}) -include_directories(${SOURCE_OSUIRC_DIR}) -include_directories(${SOURCE_UTILS_DIR}) -include_directories(${SOURCE_SETUPWIZARD_DIR}) -include_directories(${SOURCE_PREFERENCES_DIR}) -include_directories(${SOURCE_SKINSURL_DIR}) -include_directories(${SOURCE_COMMANDS_DIR}) -include_directories(${SOURCE_BACKUP_DIR}) -include_directories(${SOURCE_UPDATER_DIR}) -include_directories(${SOURCE_THEME_DIR}) -include_directories(${SOURCE_ABOUT_DIR}) +include_directories( + ${FORMS_DIR} + ${SOURCE_DIR} + ${SOURCE_TWITCH_DIR} + ${SOURCE_GOSU_DIR} + ${SOURCE_OSUIRC_DIR} + ${SOURCE_UTILS_DIR} + ${SOURCE_SETUPWIZARD_DIR} + ${SOURCE_PREFERENCES_DIR} + ${SOURCE_SKINSURL_DIR} + ${SOURCE_COMMANDS_DIR} + ${SOURCE_BACKUP_DIR} + ${SOURCE_UPDATER_DIR} + ${SOURCE_THEME_DIR} + ${SOURCE_ABOUT_DIR} +) file(GLOB_RECURSE SOURCES ${FORMS_DIR}/*.cpp @@ -98,16 +100,14 @@ endif() -target_include_directories(miraya PRIVATE ${FORMS_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_TWITCH_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_GOSU_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_OSUIRC_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_UTILS_DIR}) -target_include_directories(miraya PRIVATE ${SOURCE_SETUPWIZARD_DIR}) - +target_include_directories(miraya PRIVATE + ${FORMS_DIR} + ${SOURCE_DIR} + ${SOURCE_TWITCH_DIR} + ${SOURCE_GOSU_DIR} + ${SOURCE_OSUIRC_DIR} + ${SOURCE_UTILS_DIR} + ${SOURCE_SETUPWIZARD_DIR} +) # =========================== linking libraries =========================== -target_link_libraries(miraya PRIVATE Qt6::Core) -target_link_libraries(miraya PRIVATE Qt6::Widgets) -target_link_libraries(miraya PRIVATE Qt6::WebSockets) -target_link_libraries(miraya PRIVATE Qt6::Network) +target_link_libraries(miraya PRIVATE Qt6::Core Qt6::Widgets Qt6::WebSockets Qt6::Network) From 13f38ebabd25eb1a68c7d14bf9eae2502e6e6ca2 Mon Sep 17 00:00:00 2001 From: Sclafus Date: Sun, 18 Jun 2023 11:58:45 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=AA=A9=20main:=20v1.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.cpp b/src/main.cpp index e3b2ab3..cf32d49 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,6 +8,7 @@ int main(int argc, char **argv) { app.setOrganizationName("miraya"); app.setOrganizationDomain("github.com/MirayaProject"); app.setApplicationName("bot"); + app.setApplicationVersion("1.2.0"); #ifdef Q_OS_LINUX app.setWindowIcon(QIcon(":/resources/logo/logo.png")); #endif