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

List:       kde-commits
Subject:    [kipi-plugins/frameworks] /: fix Qt OS macro
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-12-31 17:38:23
Message-ID: E1Y6NDz-0006eV-2q () scm ! kde ! org
[Download RAW message or body]

Git commit 98f04b8f367a8342c4801f84f1f9f0056b9971e0 by Gilles Caulier.
Committed on 31/12/2014 at 17:38.
Pushed by cgilles into branch 'frameworks'.

fix Qt OS macro

M  +1    -1    PORT.KF5/PENDING/dlnaexport/welcomepage.cpp
M  +1    -1    PORT.KF5/PENDING/photolayoutseditor/extra/qtpropertybrowser/src/qtpropertybrowser.h
 M  +1    -1    PORT.KF5/TODO/advancedslideshow/dialogs/soundtrackdialog.cpp
M  +4    -4    PORT.KF5/TODO/advancedslideshow/plugin/screenproperties.cpp
M  +1    -1    PORT.KF5/TODO/expoblending/importwizard/intropage.cpp
M  +2    -2    PORT.KF5/TODO/panorama/importwizard/intropage.cpp
M  +2    -2    common/libkipiplugins/tools/kpbinaryiface.h

http://commits.kde.org/kipi-plugins/98f04b8f367a8342c4801f84f1f9f0056b9971e0

diff --git a/PORT.KF5/PENDING/dlnaexport/welcomepage.cpp \
b/PORT.KF5/PENDING/dlnaexport/welcomepage.cpp index f28d66a..9be825d 100644
--- a/PORT.KF5/PENDING/dlnaexport/welcomepage.cpp
+++ b/PORT.KF5/PENDING/dlnaexport/welcomepage.cpp
@@ -120,7 +120,7 @@ WelcomePage::WelcomePage(QWidget* const parent)
     connect(d->binariesWidget, SIGNAL(signalBinariesFound(bool)),
             this, SLOT(slotChangeOptions(bool)));
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     d->binariesWidget->setEnabled(false);
 #endif
 }
diff --git a/PORT.KF5/PENDING/photolayoutseditor/extra/qtpropertybrowser/src/qtpropertybrowser.h \
b/PORT.KF5/PENDING/photolayoutseditor/extra/qtpropertybrowser/src/qtpropertybrowser.h \
                index 31abcc5..2abcb68 100644
--- a/PORT.KF5/PENDING/photolayoutseditor/extra/qtpropertybrowser/src/qtpropertybrowser.h
                
+++ b/PORT.KF5/PENDING/photolayoutseditor/extra/qtpropertybrowser/src/qtpropertybrowser.h
 @@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 #endif
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTPROPERTYBROWSER_EXPORT) && !defined(QT_QTPROPERTYBROWSER_IMPORT)
 #    define QT_QTPROPERTYBROWSER_EXPORT
 #  elif defined(QT_QTPROPERTYBROWSER_IMPORT)
diff --git a/PORT.KF5/TODO/advancedslideshow/dialogs/soundtrackdialog.cpp \
b/PORT.KF5/TODO/advancedslideshow/dialogs/soundtrackdialog.cpp index 48c407d..8d98bce \
                100644
--- a/PORT.KF5/TODO/advancedslideshow/dialogs/soundtrackdialog.cpp
+++ b/PORT.KF5/TODO/advancedslideshow/dialogs/soundtrackdialog.cpp
@@ -22,7 +22,7 @@
 
 #include "soundtrackdialog.moc"
 
-#ifdef Q_WS_X11
+#ifdef HAVE_X11
 #include <fixx11h.h>
 #endif
 
diff --git a/PORT.KF5/TODO/advancedslideshow/plugin/screenproperties.cpp \
b/PORT.KF5/TODO/advancedslideshow/plugin/screenproperties.cpp index 97800e3..3eff365 \
                100644
--- a/PORT.KF5/TODO/advancedslideshow/plugin/screenproperties.cpp
+++ b/PORT.KF5/TODO/advancedslideshow/plugin/screenproperties.cpp
@@ -30,7 +30,7 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-#ifdef Q_WS_X11
+#ifdef HAVE_X11
 #include <QX11Info>
 
 // X11 includes
@@ -38,7 +38,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <fixx11h.h>
-#endif // Q_WS_X11
+#endif // HAVE_X11
 
 namespace KIPIAdvancedSlideshowPlugin
 {
@@ -51,7 +51,7 @@ ScreenProperties::ScreenProperties(QWidget* const mainWidget)
 unsigned ScreenProperties::suggestFrameRate()
 {
 // use XRandR only in X11
-#ifndef Q_WS_X11
+#ifndef HAVE_X11
     return 25;
 #else
     int eventBase, errorBase;
@@ -108,7 +108,7 @@ unsigned ScreenProperties::suggestFrameRate()
     //qCDebug(KIPIPLUGINS_LOG) << "using " << bestRate << " Hz as framerate for \
effects";  return bestRate;
 
-#endif // Q_WS_X11
+#endif // HAVE_X11
 }
 
 bool ScreenProperties::enableVSync()
diff --git a/PORT.KF5/TODO/expoblending/importwizard/intropage.cpp \
b/PORT.KF5/TODO/expoblending/importwizard/intropage.cpp index 5dc0328..108776d 100644
--- a/PORT.KF5/TODO/expoblending/importwizard/intropage.cpp
+++ b/PORT.KF5/TODO/expoblending/importwizard/intropage.cpp
@@ -87,7 +87,7 @@ IntroPage::IntroPage(Manager* const mngr, KAssistantDialog* const \
dlg)  d->binariesWidget = new KIPIPlugins::KPBinarySearch(binaryBox);
     d->binariesWidget->addBinary(d->mngr->alignBinary());
     d->binariesWidget->addBinary(d->mngr->enfuseBinary());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     d->binariesWidget->addDirectory("/Applications/Hugin/HuginTools");
 #endif
 
diff --git a/PORT.KF5/TODO/panorama/importwizard/intropage.cpp \
b/PORT.KF5/TODO/panorama/importwizard/intropage.cpp index 04b14da..0215ad7 100644
--- a/PORT.KF5/TODO/panorama/importwizard/intropage.cpp
+++ b/PORT.KF5/TODO/panorama/importwizard/intropage.cpp
@@ -114,10 +114,10 @@ IntroPage::IntroPage(Manager* const mngr, KAssistantDialog* \
const dlg)  d->binariesWidget->addBinary(d->mngr->nonaBinary());
     d->binariesWidget->addBinary(d->mngr->panoModifyBinary());
     d->binariesWidget->addBinary(d->mngr->pto2MkBinary());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     d->binariesWidget->addDirectory("/Applications/Hugin/HuginTools");
 #endif
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     d->binariesWidget->addDirectory("C:/Program Files/Hugin/bin");
     d->binariesWidget->addDirectory("C:/Program Files (x86)/Hugin/bin");
 #endif
diff --git a/common/libkipiplugins/tools/kpbinaryiface.h \
b/common/libkipiplugins/tools/kpbinaryiface.h index e5a595a..c2f435b 100644
--- a/common/libkipiplugins/tools/kpbinaryiface.h
+++ b/common/libkipiplugins/tools/kpbinaryiface.h
@@ -80,11 +80,11 @@ public:
 
     static QString      goodBaseName(const QString& b)
                         {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
                             return b + ".exe";
 #else
                             return b;
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
                         }
 
 public Q_SLOTS:


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