Simplify macros in kdtoolsglobal.h and kdupdater.h.

Change-Id: I83f0581abd8ca1d32b7cd9a08ce410d229560216
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

27 files changed, 55 insertions, 100 deletions

diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/environment.h b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h
index 2c0d272d1..e98f75271 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/environment.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h
@@ -12,7 +12,7 @@ QT_END_NAMESPACE
 
 namespace KDUpdater {
 
-class KDTOOLS_UPDATER_EXPORT Environment {
+class KDTOOLS_EXPORT Environment {
     public:
         static Environment& instance();
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h
index 5122a8668..4baef6f64 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h
@@ -27,7 +27,7 @@
 
 #include <QObject>
 
-class KDTOOLSCORE_EXPORT KDJob : public QObject {
+class KDTOOLS_EXPORT KDJob : public QObject {
     Q_OBJECT
     Q_PROPERTY( bool autoDelete READ autoDelete WRITE setAutoDelete )
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h
index 2cc44c381..250b442c0 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h
@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE
 class QString;
 QT_END_NAMESPACE
 
-class KDTOOLSCORE_EXPORT KDLockFile
+class KDTOOLS_EXPORT KDLockFile
 {
 public:
     explicit KDLockFile( const QString & name );
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h
index 59f35639d..845152b22 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h
@@ -27,7 +27,7 @@
 
 #include <QtCore/QString>
 
-class KDTOOLSCORE_EXPORT KDRunOnceChecker
+class KDTOOLS_EXPORT KDRunOnceChecker
 {
 
 public:
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h
index 1be9be857..420332ea1 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h
@@ -29,7 +29,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 
-class KDTOOLSCORE_EXPORT KDSaveFile : public QIODevice {
+class KDTOOLS_EXPORT KDSaveFile : public QIODevice {
     Q_OBJECT
 public:
     explicit KDSaveFile( const QString& filename=QString(), QObject* parent=0 );
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h
index f1e1892a1..3198d316c 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h
@@ -25,7 +25,7 @@
 
 #include "kdtoolsglobal.h"
 
-class KDTOOLSCORE_EXPORT KDSelfRestarter {
+class KDTOOLS_EXPORT KDSelfRestarter {
 public:
     KDSelfRestarter( int argc, char** argv );
     ~KDSelfRestarter();
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h
index 69acabf81..215df9810 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h
@@ -29,7 +29,7 @@
 #include <QtCore/QSysInfo>
 #include <QtCore/QSharedDataPointer>
 
-class KDTOOLSCORE_EXPORT KDSysInfo : public QSysInfo
+class KDTOOLS_EXPORT KDSysInfo : public QSysInfo
 {
 private:
     KDSysInfo();
@@ -37,7 +37,7 @@ private:
 public:
     ~KDSysInfo();
 
-    class KDTOOLSCORE_EXPORT Volume
+    class KDTOOLS_EXPORT Volume
     {
         friend class ::KDSysInfo;
     public:
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri
index d1914f678..6e5942af6 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri
@@ -2,8 +2,7 @@ DEPENDPATH += $$PWD
 INCLUDEPATH += $$PWD
 
 CONFIG(shared, static|shared) {
-    DEFINES += BUILD_SHARED_KDTOOLSCORE
-    DEFINES += BUILD_SHARED_KDUPDATER
+    DEFINES += BUILD_SHARED_KDTOOLS
 }
 
 HEADERS += $$PWD/kdtoolsglobal.h \
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h
index 8d94425d5..8199724c4 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h
@@ -20,54 +20,20 @@
 **
 **********************************************************************/
 
-#ifndef __KDTOOLS_KDTOOLSGLOBAL_H__
-#define __KDTOOLS_KDTOOLSGLOBAL_H__
+#ifndef KDTOOLS_KDTOOLSGLOBAL_H
+#define KDTOOLS_KDTOOLSGLOBAL_H
 
 #include <QtCore/QtGlobal>
 
 #ifdef KDTOOLS_SHARED
-#  ifdef BUILD_SHARED_KDTOOLSCORE
-#    define KDTOOLSCORE_EXPORT Q_DECL_EXPORT
+#  ifdef BUILD_SHARED_KDTOOLS
+#    define KDTOOLS_EXPORT Q_DECL_EXPORT
 #  else
-#    define KDTOOLSCORE_EXPORT Q_DECL_IMPORT
-#  endif
-#  ifdef BUILD_SHARED_KDTOOLSGUI
-#    define KDTOOLSGUI_EXPORT Q_DECL_EXPORT
-#  else
-#    define KDTOOLSGUI_EXPORT Q_DECL_IMPORT
-#  endif
-#  ifdef BUILD_SHARED_KDTOOLSXML
-#    define KDTOOLSXML_EXPORT Q_DECL_EXPORT
-#  else
-#    define KDTOOLSXML_EXPORT Q_DECL_IMPORT
-#  endif
-#  ifdef BUILD_SHARED_KDUPDATER
-#    define KDTOOLS_UPDATER_EXPORT    Q_DECL_EXPORT
-#  else
-#    define KDTOOLS_UPDATER_EXPORT    Q_DECL_IMPORT
+#    define KDTOOLS_EXPORT Q_DECL_IMPORT
 #  endif
 #else // KDTOOLS_SHARED
-#  define KDTOOLSCORE_EXPORT
-#  define KDTOOLSGUI_EXPORT
-#  define KDTOOLSXML_EXPORT
-#  define KDTOOLS_UPDATER_EXPORT
+#  define KDTOOLS_EXPORT
 #endif // KDTOOLS_SHARED
 
-#define KDTOOLS_MAKE_RELATION_OPERATORS( Class, linkage )             \
-    linkage bool operator>( const Class & lhs, const Class & rhs ) {  \
-        return operator<( rhs, lhs );                                 \
-    }                                                                 \
-    linkage bool operator!=( const Class & lhs, const Class & rhs ) { \
-        return !operator==( lhs, rhs );                               \
-    }                                                                 \
-    linkage bool operator<=( const Class & lhs, const Class & rhs ) { \
-        return !operator>( lhs, rhs );                                \
-    }                                                                 \
-    linkage bool operator>=( const Class & lhs, const Class & rhs ) { \
-        return !operator<( lhs, rhs );                                \
-    }
-
-
-
-#endif /* __KDTOOLS_KDTOOLSGLOBAL_H__ */
+#endif // KDTOOLS_KDTOOLSGLOBAL_H
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h
index 9e0007155..6c9e2c718 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h
@@ -23,17 +23,7 @@
 #ifndef KD_UPDATER_H
 #define KD_UPDATER_H
 
-#include <QtGlobal>
-
-#ifdef KDTOOLS_SHARED
-    #if defined(BUILD_SHARED_KDUPDATER)
-        #define KDTOOLS_UPDATER_EXPORT    Q_DECL_EXPORT
-    #else
-        #define KDTOOLS_UPDATER_EXPORT    Q_DECL_IMPORT
-    #endif
-#else
-    #define KDTOOLS_UPDATER_EXPORT
-#endif
+#include <kdtoolsglobal.h>
 
 namespace KDUpdater
 {
@@ -56,7 +46,7 @@ namespace KDUpdater
     Q_DECLARE_FLAGS( UpdateTypes, UpdateType )
     Q_DECLARE_OPERATORS_FOR_FLAGS( UpdateTypes )
 
-    KDTOOLS_UPDATER_EXPORT int compareVersion(const QString& v1, const QString& v2);
+    KDTOOLS_EXPORT int compareVersion(const QString& v1, const QString& v2);
 }
 
 #endif
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h
index 1d0fca6d9..4c5d5a50f 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h
@@ -44,7 +44,7 @@ namespace KDUpdater
         virtual void setValue( const QString& key, const QVariant& value ) = 0;
     };
 
-    class KDTOOLS_UPDATER_EXPORT Application : public QObject
+    class KDTOOLS_EXPORT Application : public QObject
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h
index 981d9b764..bc4f4ea8d 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h
@@ -35,7 +35,7 @@ QT_END_NAMESPACE
  * Class that provides cryptographic functionality like signing and verifying
  * or encrypting and decrypting content.
  */
-class KDTOOLS_UPDATER_EXPORT KDUpdaterCrypto {
+class KDTOOLS_EXPORT KDUpdaterCrypto {
     public:
         class PasswordProvider
         {
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h
index 929b5a191..f3079aecf 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h
@@ -35,18 +35,18 @@
 
 namespace KDUpdater
 {
-    KDTOOLS_UPDATER_EXPORT QByteArray calculateHash(QIODevice* device, QCryptographicHash::Algorithm algo);
-    KDTOOLS_UPDATER_EXPORT QByteArray calculateHash(const QString &path, QCryptographicHash::Algorithm algo);
+    KDTOOLS_EXPORT QByteArray calculateHash(QIODevice* device, QCryptographicHash::Algorithm algo);
+    KDTOOLS_EXPORT QByteArray calculateHash(const QString &path, QCryptographicHash::Algorithm algo);
 
     class HashVerificationJob;
 
-    class KDTOOLS_UPDATER_EXPORT FileDownloaderProxyFactory : public QNetworkProxyFactory
+    class KDTOOLS_EXPORT FileDownloaderProxyFactory : public QNetworkProxyFactory
     {
         public:
             virtual FileDownloaderProxyFactory *clone() = 0;
     };
 
-    class KDTOOLS_UPDATER_EXPORT FileDownloader : public QObject
+    class KDTOOLS_EXPORT FileDownloader : public QObject
     {
         Q_OBJECT
         Q_PROPERTY(bool autoRemoveDownloadedFile READ isAutoRemoveDownloadedFile WRITE setAutoRemoveDownloadedFile)
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h
index d0e614bf3..0492888df 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h
@@ -38,7 +38,7 @@ namespace KDUpdater
     class FileDownloader;
     class SignatureVerifier;
 
-    class KDTOOLS_UPDATER_EXPORT FileDownloaderFactory : public KDGenericFactory< FileDownloader >
+    class KDTOOLS_EXPORT FileDownloaderFactory : public KDGenericFactory< FileDownloader >
     {
         Q_DISABLE_COPY( FileDownloaderFactory )
     public:
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h
index d0a7ae31c..a4ecd5419 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h
@@ -35,7 +35,7 @@ namespace KDUpdater
     class Application;
     class UpdateInstaller;
 
-    struct KDTOOLS_UPDATER_EXPORT PackageInfo
+    struct KDTOOLS_EXPORT PackageInfo
     {
         QString name;
         QString pixmap;
@@ -52,7 +52,7 @@ namespace KDUpdater
         quint64 uncompressedSize;
     };
 
-    class KDTOOLS_UPDATER_EXPORT PackagesInfo : public QObject
+    class KDTOOLS_EXPORT PackagesInfo : public QObject
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h
index 6d426c820..0ad979456 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h
@@ -33,7 +33,7 @@ class QString;
 QT_END_NAMESPACE
 
 namespace KDUpdater {
-    class KDTOOLS_UPDATER_EXPORT SignatureVerificationResult {
+    class KDTOOLS_EXPORT SignatureVerificationResult {
     public:
         enum Validity {
             ValidSignature=0,
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h
index ef1da8ae3..3d86b9194 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h
@@ -35,7 +35,7 @@ namespace KDUpdater {
 
     class SignatureVerificationResult;
 
-    class KDTOOLS_UPDATER_EXPORT SignatureVerifier {
+    class KDTOOLS_EXPORT SignatureVerifier {
     public:
         virtual ~SignatureVerifier();
         virtual SignatureVerifier* clone() const = 0;
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h
index 311fd84cd..9ad30d404 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h
@@ -28,7 +28,7 @@
 
 namespace KDUpdater
 {
-    class KDTOOLS_UPDATER_EXPORT Task : public QObject
+    class KDTOOLS_EXPORT Task : public QObject
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h
index e3edc943b..f4b26c512 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h
@@ -38,7 +38,7 @@ QT_END_NAMESPACE
 
 namespace KDUpdater
 {
-    struct KDTOOLS_UPDATER_EXPORT UFHeader
+    struct KDTOOLS_EXPORT UFHeader
     {
         QString magic;
         QStringList fileList;
@@ -50,7 +50,7 @@ namespace KDUpdater
         void addToHash( QCryptographicHash& hash ) const;
     };
 
-    struct KDTOOLS_UPDATER_EXPORT UFEntry
+    struct KDTOOLS_EXPORT UFEntry
     {
         QString fileName;
         quint64 permissions;
@@ -63,11 +63,11 @@ namespace KDUpdater
         void addToHash(QCryptographicHash& hash) const;
     };
 
-    KDTOOLS_UPDATER_EXPORT QDataStream& operator<<( QDataStream& stream, const UFHeader& hdr );
-    KDTOOLS_UPDATER_EXPORT QDataStream& operator>>( QDataStream& stream, UFHeader& hdr );
+    KDTOOLS_EXPORT QDataStream& operator<<( QDataStream& stream, const UFHeader& hdr );
+    KDTOOLS_EXPORT QDataStream& operator>>( QDataStream& stream, UFHeader& hdr );
 
-    KDTOOLS_UPDATER_EXPORT QDataStream& operator<<( QDataStream& stream, const UFEntry& entry );
-    KDTOOLS_UPDATER_EXPORT QDataStream& operator>>( QDataStream& stream, UFEntry& entry );
+    KDTOOLS_EXPORT QDataStream& operator<<( QDataStream& stream, const UFEntry& entry );
+    KDTOOLS_EXPORT QDataStream& operator>>( QDataStream& stream, UFEntry& entry );
 }
 
 #endif
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h
index 1f2d31c94..f3582d0ef 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h
@@ -33,7 +33,7 @@ QT_END_NAMESPACE
 
 namespace KDUpdater
 {
-    class KDTOOLS_UPDATER_EXPORT UFUncompressor
+    class KDTOOLS_EXPORT UFUncompressor
     {
         Q_DECLARE_TR_FUNCTIONS(KDUpdater::UFUncompressor)
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h
index 4e4c711d6..8ebfcf276 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h
@@ -38,7 +38,7 @@ namespace KDUpdater
     class UpdateFinder;
     class UpdateOperation;
 
-    class KDTOOLS_UPDATER_EXPORT Update : public Task
+    class KDTOOLS_EXPORT Update : public Task
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h
index e472f42e0..3e3e84136 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h
@@ -38,7 +38,7 @@ namespace KDUpdater
     class Update;
     struct UpdateSourceInfo;
 
-    class KDTOOLS_UPDATER_EXPORT UpdateFinder : public Task
+    class KDTOOLS_EXPORT UpdateFinder : public Task
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h
index dc3e58e48..f457c3864 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h
@@ -32,7 +32,7 @@ namespace KDUpdater
     class Application;
     class Update;
 
-    class KDTOOLS_UPDATER_EXPORT UpdateInstaller : public Task
+    class KDTOOLS_EXPORT UpdateInstaller : public Task
     {
         Q_OBJECT
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h
index 53111d23a..7bd6cfcf6 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h
@@ -34,7 +34,7 @@ namespace KDUpdater
 {
     class Application;
 
-    class KDTOOLS_UPDATER_EXPORT UpdateOperation
+    class KDTOOLS_EXPORT UpdateOperation
     {
         Q_DECLARE_TR_FUNCTIONS(UpdateOperation)
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h
index 834ac1394..3f8f1244a 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h
@@ -33,7 +33,7 @@ namespace KDUpdater
     
     typedef KDGenericFactory< UpdateOperation >::FactoryFunction UpdateOperationFactoryFunction;
 
-    class KDTOOLS_UPDATER_EXPORT UpdateOperationFactory : public KDGenericFactory< UpdateOperation >
+    class KDTOOLS_EXPORT UpdateOperationFactory : public KDGenericFactory< UpdateOperation >
     {
         Q_DISABLE_COPY( UpdateOperationFactory )
     public:
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h
index 4f1a2563e..c67baa7d7 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h
@@ -32,7 +32,7 @@
 namespace KDUpdater
 {
 
-    class KDTOOLS_UPDATER_EXPORT CopyOperation : public UpdateOperation
+    class KDTOOLS_EXPORT CopyOperation : public UpdateOperation
     {
     public:
         CopyOperation();
@@ -47,7 +47,7 @@ namespace KDUpdater
         QDomDocument toXml() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT MoveOperation : public UpdateOperation
+    class KDTOOLS_EXPORT MoveOperation : public UpdateOperation
     {
     public:
         MoveOperation();
@@ -60,7 +60,7 @@ namespace KDUpdater
         MoveOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT DeleteOperation : public UpdateOperation
+    class KDTOOLS_EXPORT DeleteOperation : public UpdateOperation
     {
     public:
         DeleteOperation();
@@ -75,7 +75,7 @@ namespace KDUpdater
         QDomDocument toXml() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT MkdirOperation : public UpdateOperation
+    class KDTOOLS_EXPORT MkdirOperation : public UpdateOperation
     {
     public:
         MkdirOperation();
@@ -88,7 +88,7 @@ namespace KDUpdater
         MkdirOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT RmdirOperation : public UpdateOperation
+    class KDTOOLS_EXPORT RmdirOperation : public UpdateOperation
     {
     public:
         RmdirOperation();
@@ -101,7 +101,7 @@ namespace KDUpdater
         RmdirOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT AppendFileOperation : public UpdateOperation
+    class KDTOOLS_EXPORT AppendFileOperation : public UpdateOperation
     {
     public:
         AppendFileOperation();
@@ -114,7 +114,7 @@ namespace KDUpdater
         AppendFileOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT PrependFileOperation : public UpdateOperation
+    class KDTOOLS_EXPORT PrependFileOperation : public UpdateOperation
     {
     public:
         PrependFileOperation();
@@ -127,7 +127,7 @@ namespace KDUpdater
         PrependFileOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT ExecuteOperation : public QObject, public UpdateOperation
+    class KDTOOLS_EXPORT ExecuteOperation : public QObject, public UpdateOperation
     {
         Q_OBJECT
     public:
@@ -153,7 +153,7 @@ namespace KDUpdater
         QProcess process;
     };
 
-    class KDTOOLS_UPDATER_EXPORT UpdatePackageOperation : public UpdateOperation
+    class KDTOOLS_EXPORT UpdatePackageOperation : public UpdateOperation
     {
     public:
         UpdatePackageOperation();
@@ -166,7 +166,7 @@ namespace KDUpdater
         UpdatePackageOperation* clone() const;
     };
 
-    class KDTOOLS_UPDATER_EXPORT UpdateCompatOperation : public UpdateOperation
+    class KDTOOLS_EXPORT UpdateCompatOperation : public UpdateOperation
     {
     public:
         UpdateCompatOperation();
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h
index 231002ee0..571def8fa 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h
@@ -33,7 +33,7 @@ namespace KDUpdater
 {
     class Application;
 
-    struct KDTOOLS_UPDATER_EXPORT UpdateSourceInfo
+    struct KDTOOLS_EXPORT UpdateSourceInfo
     {
         UpdateSourceInfo() : priority(-1) { }
 
@@ -45,12 +45,12 @@ namespace KDUpdater
 
     };
 
-    KDTOOLS_UPDATER_EXPORT bool operator==( const UpdateSourceInfo & lhs, const UpdateSourceInfo & rhs );
+    KDTOOLS_EXPORT bool operator==( const UpdateSourceInfo & lhs, const UpdateSourceInfo & rhs );
     inline bool operator!= ( const UpdateSourceInfo & lhs, const UpdateSourceInfo & rhs ) {
         return !operator==( lhs, rhs );
     }
 
-    class KDTOOLS_UPDATER_EXPORT UpdateSourcesInfo : public QObject
+    class KDTOOLS_EXPORT UpdateSourcesInfo : public QObject
     {
         Q_OBJECT