Compare commits

...

2 Commits
master ... qt6

Author SHA1 Message Date
Malte Jürgens 37c1482407
fix 2023-03-05 22:24:10 +01:00
Malte Jürgens 565eef7327
test qt6 2023-03-05 22:15:23 +01:00
2 changed files with 18 additions and 18 deletions

View File

@ -14,28 +14,29 @@ string(TIMESTAMP TIMESTAMP %s)
# set(CMAKE_AUTOUIC ON) # set(CMAKE_AUTOUIC ON)
find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Widgets)
if (Qt5_FOUND) if (Qt5_FOUND AND NOT DEFINED USE_QT6)
message(STATUS "Using Qt 5")
find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets) find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
find_package(KF5Notifications)
if(KF5Notifications_FOUND)
add_definitions( -DKNOTIFICATIONS )
endif()
find_package(KF5XmlGui)
if(KF5XmlGui_FOUND)
add_definitions( -DKXMLGUI )
endif()
find_package(KF5GlobalAccel)
if(KF5GlobalAccel_FOUND)
add_definitions( -DKGLOBALACCEL )
endif()
else() else()
message(WARNING "Qt 5 was not found on your system and Qt 6 will be used. You will not be able to use any features using KDE Frameworks.") message(STATUS "Using Qt 6")
find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets) find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
endif() endif()
find_package(KF5Notifications)
if(KF5Notifications_FOUND)
add_definitions( -DKNOTIFICATIONS )
endif()
find_package(KF5XmlGui)
if(KF5XmlGui_FOUND)
add_definitions( -DKXMLGUI )
endif()
find_package(KF5GlobalAccel)
if(KF5GlobalAccel_FOUND)
add_definitions( -DKGLOBALACCEL )
endif()
set(discord-screenaudio_SRC set(discord-screenaudio_SRC
src/main.cpp src/main.cpp
src/mainwindow.cpp src/mainwindow.cpp

View File

@ -11,7 +11,6 @@
CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) { CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) {
setStyleSheet("background-color:#313338;"); setStyleSheet("background-color:#313338;");
m_layout = new QVBoxLayout(this); m_layout = new QVBoxLayout(this);
m_layout->setMargin(0);
m_layout->setSpacing(0); m_layout->setSpacing(0);
setupWebView(); setupWebView();
} }