kde4support: Temporarily partially revert 6ea7758c to fix build (original) (raw)

Martin Klapetek mklapetek at kde.org
Wed Sep 25 16:41:29 UTC 2013

Previous message: Build failed in Jenkins: kdelibs_frameworks_qt5 #1271
Next message: Review Request 112942: Move KDNSSD to tier2
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Git commit 13fa80e6a6198a440ae075fa959f8daccd516d87 by Martin Klapetek. Committed on 25/09/2013 at 16:41. Pushed by mklapetek into branch 'frameworks'.

Temporarily partially revert 6ea7758c to fix build

There seems to be a regression with recent Qt5 moc which breaks the build with this definition, so reverting it for now.

Reported upstream as QTBUG-33668.

CCMAIL:kde-frameworks-devel at kde.org

M +0 -3 staging/kde4support/CMakeLists.txt

http://commits.kde.org/kdelibs/13fa80e6a6198a440ae075fa959f8daccd516d87

diff --git a/staging/kde4support/CMakeLists.txt b/staging/kde4support/CMakeLists.txt index 24ee457..6827b87 100644 --- a/staging/kde4support/CMakeLists.txt +++ b/staging/kde4support/CMakeLists.txt @@ -39,9 +39,6 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) remove_definitions(-DQT_NO_CAST_TO_ASCII) remove_definitions(-DQT_NO_KEYWORDS)

-add_definitions(

-DKDE4SUPPORT_DEPRECATED= -)

This one won't be needed when CMake 2.8.13 is depended on.

add_definitions( -DKDE4SUPPORT_DEPRECATED_EXPORT=KDE4SUPPORT_EXPORT

Previous message: Build failed in Jenkins: kdelibs_frameworks_qt5 #1271
Next message: Review Request 112942: Move KDNSSD to tier2
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Kde-frameworks-devel mailing list