From 3ffb28427dfad63ae1986e1065f8afcbbe84eb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82?= <44851575+zneix@users.noreply.github.com> Date: Sat, 21 Nov 2020 11:24:32 +0100 Subject: [PATCH] Updated minimum required Qt versions (#2210) This updates both the build instructions and enforces qt version when running qmake --- BUILDING_ON_FREEBSD.md | 2 +- BUILDING_ON_LINUX.md | 2 +- BUILDING_ON_MAC.md | 2 +- BUILDING_ON_WINDOWS.md | 14 +++++++------- CHANGELOG.md | 1 + chatterino.pro | 6 ++++++ 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/BUILDING_ON_FREEBSD.md b/BUILDING_ON_FREEBSD.md index 796317931..201510af2 100644 --- a/BUILDING_ON_FREEBSD.md +++ b/BUILDING_ON_FREEBSD.md @@ -1,6 +1,6 @@ # FreeBSD -Note on Qt version compatibility: If you are installing Qt from a package manager, please ensure the version you are installing is at least **Qt 5.10 or newer**. +Note on Qt version compatibility: If you are installing Qt from a package manager, please ensure the version you are installing is at least **Qt 5.12 or newer**. ## FreeBSD 12.1-RELEASE diff --git a/BUILDING_ON_LINUX.md b/BUILDING_ON_LINUX.md index 3d1f76ec8..51e994f28 100644 --- a/BUILDING_ON_LINUX.md +++ b/BUILDING_ON_LINUX.md @@ -1,6 +1,6 @@ # Linux -Note on Qt version compatibility: If you are installing Qt from a package manager, please ensure the version you are installing is at least **Qt 5.10 or newer**. +Note on Qt version compatibility: If you are installing Qt from a package manager, please ensure the version you are installing is at least **Qt 5.12 or newer**. ## Ubuntu 18.04 *most likely works the same for other Debian-like distros* diff --git a/BUILDING_ON_MAC.md b/BUILDING_ON_MAC.md index 597f66fa6..a0585af54 100644 --- a/BUILDING_ON_MAC.md +++ b/BUILDING_ON_MAC.md @@ -1,5 +1,5 @@ # Building on macOS -#### Note - If you want to develop Chatterino 2 you will also need to install Qt Creator (make sure to install **Qt 5.10 or newer**) +#### Note - If you want to develop Chatterino 2 you will also need to install Qt Creator (make sure to install **Qt 5.12 or newer**) 1. Install Xcode and Xcode Command Line Utilites 2. Start Xcode, settings -> Locations, activate your Command Line Tools 3. Install brew https://brew.sh/ diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md index ab8bd43eb..26f508229 100644 --- a/BUILDING_ON_WINDOWS.md +++ b/BUILDING_ON_WINDOWS.md @@ -51,12 +51,12 @@ Note: This installation will take about 200 MB of disk space. 3. Then select "Download" Notes: - - Installing the latest Qt version is advised for new installations, but if you want to use your existing installation please ensure you are running **Qt 5.10 or later**. + - Installing the latest Qt version is advised for new installations, but if you want to use your existing installation please ensure you are running **Qt 5.12 or later**. ### When prompted which components to install: 1. Unfold the tree element that says "Qt" -2. Unfold the top most tree element (latest Qt version, e.g. `Qt 5.15.0`) +2. Unfold the top most tree element (latest Qt version, e.g. `Qt 5.15.2`) 3. Under this version, select the following entries: - `MSVC 2019 64-bit` (or alternative version if you are using that) - `Qt WebEngine` (optional) @@ -83,7 +83,7 @@ Compiling with Breakpad support enables crash reports that can be of use for dev - In the main screen, click the green "play symbol" on the bottom left to run the project directly. - Click the hammer on the bottom left to generate a build (does not run the build though). -Build results will be placed in a folder at the same level as the "chatterino2" project folder (e.g. if your sources are at `C:\Users\example\src\chatterino2`, then the build will be placed in an automatically generated folder under `C:\Users\example\src`, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_0_MSVC2019_64bit-Release`.) +Build results will be placed in a folder at the same level as the "chatterino2" project folder (e.g. if your sources are at `C:\Users\example\src\chatterino2`, then the build will be placed in an automatically generated folder under `C:\Users\example\src`, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_2_MSVC2019_64bit-Release`.) - Note that if you are building chatterino purely for usage, not for development, it is recommended that you click the "PC" icon above the play icon and select "Release" instead of "Debug". - Output and error messages produced by the compiler can be seen under the "4 Compile Output" tab in Qt Creator. @@ -92,17 +92,17 @@ Build results will be placed in a folder at the same level as the "chatterino2" If you build chatterino, the result directories will contain a `chatterino.exe` file in the `$OUTPUTDIR\release\` directory. This `.exe` file will not directly run on any given target system, because it will be lacking various Qt runtimes. -To produce a standalone package, you need to generate all required files using the tool `windeployqt`. This tool can be found in the `bin` directory of your Qt installation, e.g. at `C:\Qt\5.15.0\msvc2019_64\bin\windeployqt.exe`. +To produce a standalone package, you need to generate all required files using the tool `windeployqt`. This tool can be found in the `bin` directory of your Qt installation, e.g. at `C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe`. To produce all supplement files for a standalone build, follow these steps (adjust paths as required): - 1. Navigate to your build output directory with windows explorer, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_0_MSVC2019_64bit-Release` + 1. Navigate to your build output directory with windows explorer, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_2_MSVC2019_64bit-Release` 2. Enter the `release` directory 3. Delete all files except the `chatterino.exe` file. You should be left with a directory only containing `chatterino.exe`. 4. Open a `cmd` window and execute: - cd C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_0_MSVC2019_64bit-Release\release - C:\Qt\5.15.0\msvc2019_64\bin\windeployqt.exe chatterino.exe + cd C:\Users\example\src\build-chatterino-Desktop_Qt_5_15_2_MSVC2019_64bit-Release\release + C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe chatterino.exe 5. Go to `C:\local\bin\` and copy these dll's into your `release folder`. diff --git a/CHANGELOG.md b/CHANGELOG.md index 63221dbcf..d1d19d391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - Bugfix: Fix `:` emote completion menu ignoring emote capitalization (#1962) - Bugfix: Fix a bug that caused `Ignore page` to fall into an infinity loop with an empty pattern and regex enabled (#2125) - Bugfix: Fix a crash casued by FrankerFaceZ responding with invalid emote links (#2191) +- Dev: Updated minimum required Qt framework version to 5.12. (#2210) ## 2.2.0 diff --git a/chatterino.pro b/chatterino.pro index ad143f05a..af9f9f1ea 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -8,6 +8,12 @@ # from lib/boost.pri # - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only) +MINIMUM_REQUIRED_QT_VERSION = 5.12.0 + +!versionAtLeast(QT_VERSION, $$MINIMUM_REQUIRED_QT_VERSION) { + error("You're trying to compile with Qt $$QT_VERSION, but minimum required Qt version is $$MINIMUM_REQUIRED_QT_VERSION") +} + QT += widgets core gui network multimedia svg concurrent CONFIG += communi COMMUNI += core model util