diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-10-15 13:59:35 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-10-15 13:59:35 +0200 |
| commit | 5f3ed920fe849413ad89505075bb7135866a3082 (patch) | |
| tree | 9033212714c60475798c86ddc372bedc908b624f | |
| parent | Remove -march and -mtune from default release flags (diff) | |
| download | smolbote-5f3ed920fe849413ad89505075bb7135866a3082.tar.xz | |
Add workaround for QTBUG-62511
| -rw-r--r-- | baseconfig | 9 | ||||
| -rw-r--r-- | doc/Bugs.asciidoc | 3 | ||||
| -rw-r--r-- | linux/.config | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
4 files changed, 21 insertions, 0 deletions
@@ -89,3 +89,12 @@ config TESTS config LLVMLIBCPP bool "Link against the LLVM C++ standard library" default n + +menu "Workarounds" + config QTBUG-62511 + bool "Use RCC version 1 format" + default y + help + See QTBUG-62511: rcc embeds time in output + +endmenu diff --git a/doc/Bugs.asciidoc b/doc/Bugs.asciidoc index 057fae9..e6ba9dd 100644 --- a/doc/Bugs.asciidoc +++ b/doc/Bugs.asciidoc @@ -37,6 +37,9 @@ https://bugreports.qt.io/browse/QTBUG-68224 Only affects Qt 5.11.0. Set __QTBUG_68224_WORKAROUND__. +=== rcc embeds time in output +https://bugreports.qt.io/browse/QTBUG-62511 + === Wayland bugs === mainwindow.maximized doesn't work diff --git a/linux/.config b/linux/.config index a70ecff..ea2d51c 100644 --- a/linux/.config +++ b/linux/.config @@ -50,3 +50,8 @@ CONFIG_USEPLASMA=y CONFIG_QTWARNINGS=y # CONFIG_TESTS is not set # CONFIG_LLVMLIBCPP is not set + +# +# Workarounds +# +CONFIG_QTBUG-62511=y diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6866ac..975cc1b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,10 @@ set(srclist ${PROJECT_SOURCE_DIR}/include/browserinterface.h ) +if(CONFIG_QTBUG-62511) + set_property(SOURCE ${PROJECT_SOURCE_DIR}/data/resources.qrc PROPERTY AUTORCC_OPTIONS "--format-version=1") +endif(CONFIG_QTBUG-62511) + # if you are using a custom build location for breakpad: #if(CONFIG_USEBREAKPAD) # link_directories("${BREAKPAD_LIBRARY_DIRS}") |