[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-release-team
Subject:    [kcalcore/Applications/19.04] /: Revert "Workaround qt5.13 bug"
From:       Ben Cooksley <null () kde ! org>
Date:       2019-03-26 9:31:32
Message-ID: E1h8iQe-0001PV-8y () code ! kde ! org
[Download RAW message or body]

Git commit 39f2fad430bbb9fce1632243367dd39cef4227fe by Ben Cooksley.
Committed on 26/03/2019 at 09:24.
Pushed by bcooksley into branch 'Applications/19.04'.

Revert "Workaround qt5.13 bug"

This breaks the build on all platforms on the CI, and also causes all Dependency Builds to fail for \
Products which contain applications/libraries reliant on kcalcore.

Given the appropriate mailing list was informed, it appears that the state of this being broken is simply \
being ignored, which is not acceptable. This commit may not be re-instated in any form without active \
consent from discussion on release-team.

CCMAIL: kde-pim@kde.org
CCMAIL: release-team@kde.org

This reverts commit f8d55fdd8ac27b27e7eb9e87a882f11a2aac5348.

M  +1    -6    CMakeLists.txt

https://commits.kde.org/kcalcore/39f2fad430bbb9fce1632243367dd39cef4227fe

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c13a98659..5acbad1c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,12 +53,7 @@ configure_package_config_file(
 )
 
 
-# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it)
-if (${Qt5Widgets_VERSION} STRGREATER "5.13")
-   MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug \
                QTBUG-74665")
-else()
-   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
-endif()
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 add_definitions(-DQT_NO_FOREACH)
 
 ########### Targets ###########


[prev in list] [next in list] [prev in thread] [next in thread]