[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1e770f6

The following commit has been merged in the master branch:
commit 1e770f6deb56254f35e18da79db38815158e377e
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Mon Aug 11 20:11:06 2014 +0200

    fix exporting stuff
---
 src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h | 9 ++++-----
 src/KCMTelepathyAccounts/validated-line-edit.h           | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h b/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h
index fd1d320..f6bb714 100644
--- a/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h
+++ b/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h
@@ -20,21 +20,20 @@
 #ifndef KCM_TELEPATHY_ACCOUNTS_EXPORT_H
 #define KCM_TELEPATHY_ACCOUNTS_EXPORT_H
 
-/* needed for KCM_TELEPATHY_ACCOUNTS_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
+#include <QtCore/QtGlobal>
 
 #ifndef KCM_TELEPATHY_ACCOUNTS_EXPORT
 # if defined(MAKE_KCM_TELEPATHY_ACCOUNTS_LIB)
    /* We are building this library */
-#  define KCM_TELEPATHY_ACCOUNTS_EXPORT KDE_EXPORT
+#  define KCM_TELEPATHY_ACCOUNTS_EXPORT Q_DECL_EXPORT
 # else
    /* We are using this library */
-#  define KCM_TELEPATHY_ACCOUNTS_EXPORT KDE_IMPORT
+#  define KCM_TELEPATHY_ACCOUNTS_EXPORT Q_DECL_IMPORT
 # endif
 #endif
 
 # ifndef KCM_TELEPATHY_ACCOUNTS_EXPORT_DEPRECATED
-#  define KCM_TELEPATHY_ACCOUNTS_EXPORT_DEPRECATED KDE_DEPRECATED KCM_TELEPATHY_ACCOUNTS_EXPORT
+#  define KCM_TELEPATHY_ACCOUNTS_EXPORT_DEPRECATED Q_DECL_DEPRECATED KCM_TELEPATHY_ACCOUNTS_EXPORT
 # endif
 
 #endif
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.h b/src/KCMTelepathyAccounts/validated-line-edit.h
index 94bca30..fa0055a 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.h
+++ b/src/KCMTelepathyAccounts/validated-line-edit.h
@@ -22,7 +22,6 @@
 #define VALIDATEDLINEEDIT_H
 
 #include <QLineEdit>
-#include <kdemacros.h>
 #include <QValidator>
 
 class QLabel;
@@ -32,7 +31,7 @@ class ValidationIconWidget;
 class QAbstractItemModel;
 class QModelIndex;
 
-class KDE_EXPORT ValidatedLineEdit : public QLineEdit
+class Q_DECL_EXPORT ValidatedLineEdit : public QLineEdit
 {
     Q_OBJECT
 

-- 
ktp-accounts-kcm packaging