From a4d8cab67e4861a0d2524365e5f177dae08cf4f3 Mon Sep 17 00:00:00 2001 From: msuih Date: Sat, 26 Oct 2019 05:19:07 +0300 Subject: [PATCH] Qt version bump Also gives a tip about the Qt5_DIR definition. --- 3rdparty/qt5.cmake | 16 +++++++--------- BUILDING.md | 8 ++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/3rdparty/qt5.cmake b/3rdparty/qt5.cmake index 8ba283328c..904ce2b73b 100644 --- a/3rdparty/qt5.cmake +++ b/3rdparty/qt5.cmake @@ -1,11 +1,11 @@ add_library(3rdparty_qt5 INTERFACE) -find_package(Qt5 5.10 CONFIG COMPONENTS Widgets Network Qml Concurrent) +find_package(Qt5 5.11 CONFIG COMPONENTS Widgets Network Qml Concurrent) if(WIN32) - find_package(Qt5 5.10 COMPONENTS WinExtras REQUIRED) + find_package(Qt5 5.11 COMPONENTS WinExtras REQUIRED) target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent) else() - find_package(Qt5 5.10 COMPONENTS DBus Gui) + find_package(Qt5 5.11 COMPONENTS DBus Gui) if(Qt5DBus_FOUND) target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent) target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS) @@ -16,18 +16,15 @@ else() endif() if(NOT Qt5Widgets_FOUND) - if(Qt5Widgets_VERSION VERSION_LESS 5.10.0) - message("Minimum supported Qt5 version is 5.10.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") + if(Qt5Widgets_VERSION VERSION_LESS 5.11.0) + message("Minimum supported Qt5 version is 5.11.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") if(CMAKE_SYSTEM MATCHES "Linux") message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt. If you're on Ubuntu or Linux Mint, there are PPAs you can use to install one of the latest qt5 versions. https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.11.0-bionic https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.11.0-xenial - https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-trusty just make sure to run source /opt/qt511/bin/qt511-env.sh -respective - source /opt/qt510/bin/qt510-env.sh before re-running cmake") elseif(WIN32) message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/") @@ -38,7 +35,8 @@ before re-running cmake") message("CMake was unable to find Qt5!") if(WIN32) - message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.11.1\\msvc2017_64\\)") + message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.11.1\\msvc2017_64\\) +You can also try setting the Qt5_DIR preprocessor definiton.") elseif(CMAKE_SYSTEM MATCHES "Linux") message(FATAL_ERROR "Make sure to install your distro's qt5 package!") else() diff --git a/BUILDING.md b/BUILDING.md index 03dc7ee631..ca8f8e31f3 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [CMake 3.14.1+](https://www.cmake.org/download/) (add to PATH) * [Python 3.3+](https://www.python.org/downloads/) (add to PATH) -* [Qt 5.10+](https://www.qt.io/download-qt-installer) (Avoid 5.11.1, due to a bug) +* [Qt 5.11+](https://www.qt.io/download-qt-installer) (Avoid 5.11.1, due to a bug) * [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) * [Vulkan SDK 1.1.97.0+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) -**Either add the** `QTDIR` **environment variable, e.g.** `\5.10.0\msvc2017_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools-19123)** +**Either add the** `QTDIR` **environment variable, e.g.** `\5.11.0\msvc2017_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools-19123)** ### Linux @@ -21,7 +21,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 5.0+ or GCC 8.1+ * [CMake 3.8.2+](https://www.cmake.org/download/) -* [Qt 5.10+](https://www.qt.io/download-qt-installer) (Avoid 5.11.1, due to a bug) +* [Qt 5.11+](https://www.qt.io/download-qt-installer) (Avoid 5.11.1, due to a bug) * [Vulkan SDK 1.1.97.0+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) * [SDL2](https://www.libsdl.org/download-2.0.php) (for the FAudio backend) @@ -92,7 +92,7 @@ git submodule update --init #### Configuring the Qt plugin (if used) 1) Go to the Qt5 menu and edit Qt5 options. -2) Add the path to your Qt installation with compiler e.g. `\5.10.0\msvc2017_64`. +2) Add the path to your Qt installation with compiler e.g. `\5.11.0\msvc2017_64`. 3) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. #### Building the projects