mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 14:33:21 +02:00
Merge pull request #8318 from Docteh/cmake-qt56-entry
Update some files with Qt 5.15.2 best practices in mind
This commit is contained in:
commit
266e086706
@ -187,7 +187,7 @@ if (ENABLE_QT_TRANSLATION)
|
|||||||
# Update source TS file if enabled
|
# Update source TS file if enabled
|
||||||
if (GENERATE_QT_TRANSLATION)
|
if (GENERATE_QT_TRANSLATION)
|
||||||
get_target_property(SRCS yuzu SOURCES)
|
get_target_property(SRCS yuzu SOURCES)
|
||||||
qt5_create_translation(QM_FILES
|
qt_create_translation(QM_FILES
|
||||||
${SRCS}
|
${SRCS}
|
||||||
${UIS}
|
${UIS}
|
||||||
${YUZU_QT_LANGUAGES}/en.ts
|
${YUZU_QT_LANGUAGES}/en.ts
|
||||||
@ -203,7 +203,7 @@ if (ENABLE_QT_TRANSLATION)
|
|||||||
list(REMOVE_ITEM LANGUAGES_TS ${YUZU_QT_LANGUAGES}/en.ts)
|
list(REMOVE_ITEM LANGUAGES_TS ${YUZU_QT_LANGUAGES}/en.ts)
|
||||||
|
|
||||||
# Compile TS files to QM files
|
# Compile TS files to QM files
|
||||||
qt5_add_translation(LANGUAGES_QM ${LANGUAGES_TS})
|
qt_add_translation(LANGUAGES_QM ${LANGUAGES_TS})
|
||||||
|
|
||||||
# Build a QRC file from the QM file list
|
# Build a QRC file from the QM file list
|
||||||
set(LANGUAGES_QRC ${CMAKE_CURRENT_BINARY_DIR}/languages.qrc)
|
set(LANGUAGES_QRC ${CMAKE_CURRENT_BINARY_DIR}/languages.qrc)
|
||||||
@ -215,7 +215,7 @@ if (ENABLE_QT_TRANSLATION)
|
|||||||
file(APPEND ${LANGUAGES_QRC} "</qresource></RCC>")
|
file(APPEND ${LANGUAGES_QRC} "</qresource></RCC>")
|
||||||
|
|
||||||
# Add the QRC file to package in all QM files
|
# Add the QRC file to package in all QM files
|
||||||
qt5_add_resources(LANGUAGES ${LANGUAGES_QRC})
|
qt_add_resources(LANGUAGES ${LANGUAGES_QRC})
|
||||||
else()
|
else()
|
||||||
set(LANGUAGES)
|
set(LANGUAGES)
|
||||||
endif()
|
endif()
|
||||||
@ -236,7 +236,11 @@ if (APPLE)
|
|||||||
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
|
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
# compile as a win32 gui application instead of a console application
|
# compile as a win32 gui application instead of a console application
|
||||||
target_link_libraries(yuzu PRIVATE Qt5::WinMain)
|
if (QT_VERSION VERSION_GREATER 6)
|
||||||
|
target_link_libraries(yuzu PRIVATE Qt6::EntryPointPrivate)
|
||||||
|
else()
|
||||||
|
target_link_libraries(yuzu PRIVATE Qt5::WinMain)
|
||||||
|
endif()
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
|
set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
|
||||||
elseif(MINGW)
|
elseif(MINGW)
|
||||||
@ -247,7 +251,7 @@ endif()
|
|||||||
create_target_directory_groups(yuzu)
|
create_target_directory_groups(yuzu)
|
||||||
|
|
||||||
target_link_libraries(yuzu PRIVATE common core input_common video_core)
|
target_link_libraries(yuzu PRIVATE common core input_common video_core)
|
||||||
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets)
|
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt::Widgets)
|
||||||
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
||||||
|
|
||||||
target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
|
target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
|
||||||
@ -255,7 +259,7 @@ if (NOT WIN32)
|
|||||||
target_include_directories(yuzu PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
target_include_directories(yuzu PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
||||||
endif()
|
endif()
|
||||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
target_link_libraries(yuzu PRIVATE Qt5::DBus)
|
target_link_libraries(yuzu PRIVATE Qt::DBus)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(yuzu PRIVATE
|
target_compile_definitions(yuzu PRIVATE
|
||||||
@ -291,7 +295,7 @@ if (USE_DISCORD_PRESENCE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_QT_WEB_ENGINE)
|
if (YUZU_USE_QT_WEB_ENGINE)
|
||||||
target_link_libraries(yuzu PRIVATE Qt5::WebEngineCore Qt5::WebEngineWidgets)
|
target_link_libraries(yuzu PRIVATE Qt::WebEngineCore Qt::WebEngineWidgets)
|
||||||
target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE)
|
target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -752,7 +752,7 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) {
|
|||||||
input_subsystem->GetMouse()->MouseMove(x, y, touch_x, touch_y, center_x, center_y);
|
input_subsystem->GetMouse()->MouseMove(x, y, touch_x, touch_y, center_x, center_y);
|
||||||
|
|
||||||
if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) {
|
if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) {
|
||||||
QCursor::setPos(mapToGlobal({center_x, center_y}));
|
QCursor::setPos(mapToGlobal(QPoint{center_x, center_y}));
|
||||||
}
|
}
|
||||||
|
|
||||||
emit MouseActivity();
|
emit MouseActivity();
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
|
#include <QStringList>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QTouchEvent>
|
#include <QTouchEvent>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
@ -20,7 +21,6 @@
|
|||||||
class GRenderWindow;
|
class GRenderWindow;
|
||||||
class GMainWindow;
|
class GMainWindow;
|
||||||
class QKeyEvent;
|
class QKeyEvent;
|
||||||
class QStringList;
|
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
enum class SystemResultStatus : u32;
|
enum class SystemResultStatus : u32;
|
||||||
|
@ -151,6 +151,8 @@ void ConfigureMotionTouch::ConnectEvents() {
|
|||||||
&ConfigureMotionTouch::OnConfigureTouchCalibration);
|
&ConfigureMotionTouch::OnConfigureTouchCalibration);
|
||||||
connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this,
|
connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this,
|
||||||
&ConfigureMotionTouch::OnConfigureTouchFromButton);
|
&ConfigureMotionTouch::OnConfigureTouchFromButton);
|
||||||
|
connect(ui->buttonBox, &QDialogButtonBox::accepted, this,
|
||||||
|
&ConfigureMotionTouch::ApplyConfiguration);
|
||||||
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] {
|
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] {
|
||||||
if (CanCloseDialog()) {
|
if (CanCloseDialog()) {
|
||||||
reject();
|
reject();
|
||||||
|
@ -293,22 +293,5 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections/>
|
||||||
<connection>
|
|
||||||
<sender>buttonBox</sender>
|
|
||||||
<signal>accepted()</signal>
|
|
||||||
<receiver>ConfigureMotionTouch</receiver>
|
|
||||||
<slot>ApplyConfiguration()</slot>
|
|
||||||
<hints>
|
|
||||||
<hint type="sourcelabel">
|
|
||||||
<x>20</x>
|
|
||||||
<y>20</y>
|
|
||||||
</hint>
|
|
||||||
<hint type="destinationlabel">
|
|
||||||
<x>20</x>
|
|
||||||
<y>20</y>
|
|
||||||
</hint>
|
|
||||||
</hints>
|
|
||||||
</connection>
|
|
||||||
</connections>
|
|
||||||
</ui>
|
</ui>
|
||||||
|
@ -130,8 +130,7 @@ void ConfigureSystem::ApplyConfiguration() {
|
|||||||
// Guard if during game and set to game-specific value
|
// Guard if during game and set to game-specific value
|
||||||
if (Settings::values.rng_seed.UsingGlobal()) {
|
if (Settings::values.rng_seed.UsingGlobal()) {
|
||||||
if (ui->rng_seed_checkbox->isChecked()) {
|
if (ui->rng_seed_checkbox->isChecked()) {
|
||||||
Settings::values.rng_seed.SetValue(
|
Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
|
||||||
ui->rng_seed_edit->text().toULongLong(nullptr, 16));
|
|
||||||
} else {
|
} else {
|
||||||
Settings::values.rng_seed.SetValue(std::nullopt);
|
Settings::values.rng_seed.SetValue(std::nullopt);
|
||||||
}
|
}
|
||||||
@ -142,8 +141,7 @@ void ConfigureSystem::ApplyConfiguration() {
|
|||||||
case ConfigurationShared::CheckState::Off:
|
case ConfigurationShared::CheckState::Off:
|
||||||
Settings::values.rng_seed.SetGlobal(false);
|
Settings::values.rng_seed.SetGlobal(false);
|
||||||
if (ui->rng_seed_checkbox->isChecked()) {
|
if (ui->rng_seed_checkbox->isChecked()) {
|
||||||
Settings::values.rng_seed.SetValue(
|
Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
|
||||||
ui->rng_seed_edit->text().toULongLong(nullptr, 16));
|
|
||||||
} else {
|
} else {
|
||||||
Settings::values.rng_seed.SetValue(std::nullopt);
|
Settings::values.rng_seed.SetValue(std::nullopt);
|
||||||
}
|
}
|
||||||
|
@ -483,7 +483,7 @@ void GameList::DonePopulating(const QStringList& watch_list) {
|
|||||||
// Also artificially caps the watcher to a certain number of directories
|
// Also artificially caps the watcher to a certain number of directories
|
||||||
constexpr int LIMIT_WATCH_DIRECTORIES = 5000;
|
constexpr int LIMIT_WATCH_DIRECTORIES = 5000;
|
||||||
constexpr int SLICE_SIZE = 25;
|
constexpr int SLICE_SIZE = 25;
|
||||||
int len = std::min(watch_list.length(), LIMIT_WATCH_DIRECTORIES);
|
int len = std::min(static_cast<int>(watch_list.size()), LIMIT_WATCH_DIRECTORIES);
|
||||||
for (int i = 0; i < len; i += SLICE_SIZE) {
|
for (int i = 0; i < len; i += SLICE_SIZE) {
|
||||||
watcher->addPaths(watch_list.mid(i, i + SLICE_SIZE));
|
watcher->addPaths(watch_list.mid(i, i + SLICE_SIZE));
|
||||||
QCoreApplication::processEvents();
|
QCoreApplication::processEvents();
|
||||||
|
@ -183,7 +183,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
|
|||||||
|
|
||||||
void LoadingScreen::paintEvent(QPaintEvent* event) {
|
void LoadingScreen::paintEvent(QPaintEvent* event) {
|
||||||
QStyleOption opt;
|
QStyleOption opt;
|
||||||
opt.init(this);
|
opt.initFrom(this);
|
||||||
QPainter p(this);
|
QPainter p(this);
|
||||||
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
|
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
|
||||||
QWidget::paintEvent(event);
|
QWidget::paintEvent(event);
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
#include <QtGlobal>
|
||||||
|
|
||||||
#if !QT_CONFIG(movie)
|
#if !QT_CONFIG(movie)
|
||||||
#define YUZU_QT_MOVIE_MISSING 1
|
#define YUZU_QT_MOVIE_MISSING 1
|
||||||
@ -88,4 +89,6 @@ private:
|
|||||||
std::size_t slow_shader_first_value = 0;
|
std::size_t slow_shader_first_value = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
Q_DECLARE_METATYPE(VideoCore::LoadCallbackStage);
|
Q_DECLARE_METATYPE(VideoCore::LoadCallbackStage);
|
||||||
|
#endif
|
||||||
|
@ -1612,7 +1612,7 @@ void GMainWindow::StoreRecentFile(const QString& filename) {
|
|||||||
|
|
||||||
void GMainWindow::UpdateRecentFiles() {
|
void GMainWindow::UpdateRecentFiles() {
|
||||||
const int num_recent_files =
|
const int num_recent_files =
|
||||||
std::min(UISettings::values.recent_files.size(), max_recent_files_item);
|
std::min(static_cast<int>(UISettings::values.recent_files.size()), max_recent_files_item);
|
||||||
|
|
||||||
for (int i = 0; i < num_recent_files; i++) {
|
for (int i = 0; i < num_recent_files; i++) {
|
||||||
const QString text = QStringLiteral("&%1. %2").arg(i + 1).arg(
|
const QString text = QStringLiteral("&%1. %2").arg(i + 1).arg(
|
||||||
@ -3350,7 +3350,7 @@ void GMainWindow::CenterMouseCursor() {
|
|||||||
const int center_x = render_window->width() / 2;
|
const int center_x = render_window->width() / 2;
|
||||||
const int center_y = render_window->height() / 2;
|
const int center_y = render_window->height() / 2;
|
||||||
|
|
||||||
QCursor::setPos(mapToGlobal({center_x, center_y}));
|
QCursor::setPos(mapToGlobal(QPoint{center_x, center_y}));
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnMouseActivity() {
|
void GMainWindow::OnMouseActivity() {
|
||||||
|
Loading…
Reference in New Issue
Block a user