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

List:       kde-commits
Subject:    [digikam/frameworks] libs/dimg/filters/icc: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-12-31 17:53:16
Message-ID: E1Y6NSO-0006Jw-Og () scm ! kde ! org
[Download RAW message or body]

Git commit 3f97c089f3755bbd702a09444882c72e09b86271 by Gilles Caulier.
Committed on 31/12/2014 at 17:53.
Pushed by cgilles into branch 'frameworks'.

polish

M  +6    -4    libs/dimg/filters/icc/iccsettings.cpp

http://commits.kde.org/digikam/3f97c089f3755bbd702a09444882c72e09b86271

diff --git a/libs/dimg/filters/icc/iccsettings.cpp b/libs/dimg/filters/icc/=
iccsettings.cpp
index 18ace85..f26f406 100644
--- a/libs/dimg/filters/icc/iccsettings.cpp
+++ b/libs/dimg/filters/icc/iccsettings.cpp
@@ -27,13 +27,14 @@
 =

 // X11 includes
 =

-#ifdef HAVE_X11
+#pragma message("PORT QT5")
+#ifdef Q_WS__X11
 #   include <climits>
 #   include <X11/Xlib.h>
 #   include <X11/Xatom.h>
 #   include <fixx11h.h>
 #   include <QX11Info>
-#endif /* HAVE_X11 */
+#endif /* Q_WS__X11 */
 =

 // Qt includes
 =

@@ -50,10 +51,10 @@
 #include <kconfiggroup.h>
 #include <kglobal.h>
 #include <ksharedconfig.h>
-#include "digikam_debug.h"
 =

 // Local includes
 =

+#include "digikam_debug.h"
 #include "iccprofile.h"
 #include "icctransform.h"
 =

@@ -190,7 +191,8 @@ bool IccSettings::monitorProfileFromSystem() const
 */
 IccProfile IccSettings::Private::profileFromWindowSystem(QWidget* const wi=
dget)
 {
-#ifdef HAVE_X11
+#pragma message("PORT QT5")
+#ifdef Q_WS__X11
 =

     Qt::HANDLE appRootWindow;
     QString    atomName;
[prev in list] [next in list] [prev in thread] [next in thread]