From kde-commits  Thu Oct 24 17:54:33 2013
From: Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date: Thu, 24 Oct 2013 17:54:33 +0000
To: kde-commits
Subject: [kcm-grub2] /: Compile with QT_NO_KEYWORDS, QT_STRICT_ITERATORS.
Message-Id: <E1VZP7B-0001vj-Ct () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138263728421548

Git commit a1ce8c29bff8eaa7e37557726401a762740b7a45 by Konstantinos Smanis.
Committed on 24/10/2013 at 14:22.
Pushed by ksmanis into branch 'master'.

Compile with QT_NO_KEYWORDS, QT_STRICT_ITERATORS.

M  +4    -1    CMakeLists.txt

http://commits.kde.org/kcm-grub2/a1ce8c29bff8eaa7e37557726401a762740b7a45

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5066cc8..010debc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,10 @@ find_package(KDE4 4.4.0 REQUIRED)
 include(KDE4Defaults)
 include(GRUBPaths)
 =

-add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_USE_FAST_CONCATENATION -D=
QT_USE_FAST_OPERATOR_PLUS -DMAGICKCORE_QUANTUM_DEPTH=3D16 -DMAGICKCORE_HDRI=
_ENABLE=3D0)
+# Qt
+add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS -DQT_STRICT_I=
TERATORS -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+# ImageMagick
+add_definitions(-DMAGICKCORE_HDRI_ENABLE=3D0 -DMAGICKCORE_QUANTUM_DEPTH=3D=
16)
 =

 macro_optional_find_package(ImageMagick COMPONENTS Magick++ MagickCore)
 macro_log_feature(ImageMagick_FOUND "ImageMagick" "Create splash images co=
mpatible with GRUB2" "http://www.imagemagick.org/" FALSE "" "")