From 5266dd6c60f366a590dc4db43ab2afa5f0bc7217 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 22 Feb 2018 23:08:14 +0100 Subject: [PATCH] Update for Qt 5.10 (#4202) * Update Readme for Qt 5.10 * Update cmake for Qt 5.10 * Update travis to Qt 5.10.1 --- .travis.yml | 16 ++++++++-------- README.md | 8 ++++---- qt-installer-noninteractive.qs | 2 +- rpcs3/CMakeLists.txt | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf1e8550ca..6cdd422338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ before_script: - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - mkdir build - cd build - - export CMAKE_PREFIX_PATH=~/Qt/5.10.0/gcc_64/lib/cmake + - export CMAKE_PREFIX_PATH=~/Qt/5.10.1/gcc_64/lib/cmake - export CXXFLAGS="$CXXFLAGS -DTRAVIS=true"; - if [ "$TRAVIS_PULL_REQUEST" = false ]; then export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"; @@ -63,20 +63,20 @@ before_script: - ninja - # AppImage generation - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then - export LD_LIBRARY_PATH=~/Qt/5.10.0/gcc_64/lib; + export LD_LIBRARY_PATH=~/Qt/5.10.1/gcc_64/lib; DESTDIR=appdir ninja install ; find appdir/ ; find ../bin ; wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; chmod a+x linuxdeployqt*.AppImage ; - export PATH=~/Qt/5.10.0/gcc_64/bin/:${PATH} ; + export PATH=~/Qt/5.10.1/gcc_64/bin/:${PATH} ; ./linuxdeployqt*.AppImage --appimage-extract ; ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs ; mkdir ./appdir/usr/plugins/xcbglintegrations/ ; mkdir ./appdir/usr/plugins/imageformats/ ; - cp ~/Qt/5.10.0/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ; - cp ~/Qt/5.10.0/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ; - cp ~/Qt/5.10.0/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ; - cp ~/Qt/5.10.0/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ; + cp ~/Qt/5.10.1/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ; + cp ~/Qt/5.10.1/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ; + cp ~/Qt/5.10.1/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ; + cp ~/Qt/5.10.1/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ; rm ./appdir/usr/lib/libfreetype.so.6 ; export PATH=${TRAVIS_BUILD_DIR}/build/squashfs-root/usr/bin/:${PATH} ; ./squashfs-root/usr/bin/appimagetool ${TRAVIS_BUILD_DIR}/build/appdir ; @@ -117,7 +117,7 @@ addons: - libstdc++-5-dev - lib32stdc++6 - zlib1g-dev - # We need to install qt 5.10.0 manually because the version trusty provides is too old. + # We need to install qt 5.10.1 manually because the version trusty provides is too old. #- qtbase5-dev - libudev-dev - libevdev-dev diff --git a/README.md b/README.md index 12173aea30..bbf9db3c7b 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,11 @@ If you want to contribute please take a look at the [Coding Style](https://githu * [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145) * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH) * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH) -* [Qt 5.8+](https://www.qt.io/download-open-source/) (required; add QTDIR `\5.8\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin) +* [Qt 5.10+](https://www.qt.io/download-open-source/) (required; add QTDIR environment variable if you do not want to use the Visual Studio Qt Plugin: e.g. `\5.10.1\msvc2015_64\`) * [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above) ### Linux -* [Qt 5.7+](https://www.qt.io/download-open-source/) +* [Qt 5.10+](https://www.qt.io/download-open-source/) * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691)) * Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default` * Arch: `sudo pacman -S glew openal cmake llvm qt5-base` @@ -48,14 +48,14 @@ To initialize the repository don't forget to execute `git submodule update --ini ### Configuring Qt *If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* -1) Add `QTDIR` environment variable and set it to `\5.8\msvc2015_64\`
+1) Add `QTDIR` environment variable and set it to e.g `\5.10.1\msvc2015_64\`
Open `rpcs3.sln` *If you wish to use the Visual Studio plugin for Qt:*
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.8\msvc2015_64`.
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.10.1\msvc2015_64`.
2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. ### Building the projects diff --git a/qt-installer-noninteractive.qs b/qt-installer-noninteractive.qs index 79836bc436..cc013e812a 100644 --- a/qt-installer-noninteractive.qs +++ b/qt-installer-noninteractive.qs @@ -33,7 +33,7 @@ Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); widget.deselectAll(); - widget.selectComponent("qt.qt5.5100.gcc_64"); + widget.selectComponent("qt.qt5.5101.gcc_64"); gui.clickButton(buttons.NextButton); } diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 7b32e86907..38c6cc231e 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -6,12 +6,12 @@ set(CMAKE_CXX_STANDARD 14) include(CheckCXXCompilerFlag) # Qt section -find_package(Qt5 5.7 COMPONENTS Widgets Network) +find_package(Qt5 5.10 COMPONENTS Widgets Network) if(WIN32) - find_package(Qt5 5.7 COMPONENTS WinExtras REQUIRED) + find_package(Qt5 5.10 COMPONENTS WinExtras REQUIRED) set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras Qt5::Network) else() - find_package(Qt5 5.7 COMPONENTS DBus Gui) + find_package(Qt5 5.10 COMPONENTS DBus Gui) if(Qt5DBus_FOUND) set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus Qt5::Network) add_definitions(-DHAVE_QTDBUS) @@ -23,15 +23,15 @@ endif() # Let's make sure we have Qt before we continue if(NOT Qt5Widgets_FOUND) - if(Qt5Widgets_VERSION VERSION_LESS 5.7.0) - message("Minimum supported Qt5 version is 5.7! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") + 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("${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 an up-to-date qt5 version. - https://launchpad.net/~beineri/+archive/ubuntu/opt-qt593-xenial - https://launchpad.net/~beineri/+archive/ubuntu/opt-qt593-trusty + https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-xenial + https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-trusty just make sure to run - source /opt/qt59/bin/qt59-env.sh + 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/") @@ -42,7 +42,7 @@ 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.8\\msvc2017_64\\)") + message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.10.1\\msvc2017_64\\)") elseif("${CMAKE_SYSTEM}" MATCHES "Linux") message(FATAL_ERROR "Make sure to install your distro's qt5 package!") else()