diff options
Diffstat (limited to 'installerbuilder/libinstaller/3rdparty/kdtools')
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri | 31 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr | 1 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/environment.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/environment.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdjob.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_p.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_p.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_unix.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_win.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_win.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.h) | 4 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_mac.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_win.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_x11.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater.pri) | 32 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdtoolsglobal.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdater.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader_p.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader_p.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h) | 4 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor_p.h) | 2 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.h) | 4 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo_p.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo_p.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.h) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.cpp (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.cpp) | 0 | ||||
-rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.h (renamed from installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.h) | 2 |
68 files changed, 48 insertions, 52 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri deleted file mode 100644 index 2dea65a66..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri +++ /dev/null @@ -1,31 +0,0 @@ -DEPENDPATH += $$PWD -INCLUDEPATH += $$PWD - -CONFIG( shared, static|shared) { - DEFINES += BUILD_SHARED_KDTOOLSCORE -} - -HEADERS += $$PWD/pimpl_ptr.h \ - $$PWD/kdtoolsglobal.h \ - $$PWD/kdjob.h \ - $$PWD/kdgenericfactory.h \ - $$PWD/kdselfrestarter.h \ - $$PWD/kdsavefile.h \ - $$PWD/kdrunoncechecker.h \ - $$PWD/kdlockfile.h \ - $$PWD/kdsysinfo.h - -SOURCES += $$PWD/pimpl_ptr.cpp \ - $$PWD/kdjob.cpp \ - $$PWD/kdgenericfactory.cpp \ - $$PWD/kdselfrestarter.cpp \ - $$PWD/kdsavefile.cpp \ - $$PWD/kdrunoncechecker.cpp \ - $$PWD/kdlockfile.cpp \ - $$PWD/kdsysinfo.cpp - -unix:SOURCES += $$PWD/kdlockfile_unix.cpp -win32:SOURCES += $$PWD/kdlockfile_win.cpp -win32:SOURCES += $$PWD/kdsysinfo_win.cpp -macx:SOURCES += $$PWD/kdsysinfo_mac.cpp -unix:!macx:SOURCES += $$PWD/kdsysinfo_x11.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr deleted file mode 100644 index aa2f3984a..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr +++ /dev/null @@ -1 +0,0 @@ -#include "pimpl_ptr.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/environment.cpp index f269bba72..f269bba72 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/environment.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.h b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h index 2c0d272d1..2c0d272d1 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.cpp index 9352f83cd..9352f83cd 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.h index 08a9984a2..1e044bafd 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.h @@ -23,7 +23,7 @@ #ifndef __KDTOOLSCORE__KDGENERICFACTORY_H__ #define __KDTOOLSCORE__KDGENERICFACTORY_H__ -#include <KDToolsCore/kdtoolsglobal.h> +#include <kdtoolsglobal.h> #include <QtCore/QHash> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.cpp index d88380ffb..d88380ffb 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h index 10cdd6899..1da7f1074 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h @@ -25,7 +25,7 @@ #include <QObject> -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> class KDTOOLSCORE_EXPORT KDJob : public QObject { Q_OBJECT diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.cpp index 234bc448e..234bc448e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h index 3334f385f..3334f385f 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_p.h index da4c4dc4c..da4c4dc4c 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_p.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_p.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_unix.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp index 4f6ed3cbb..4f6ed3cbb 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_unix.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_win.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_win.cpp index f7fed60ab..f7fed60ab 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_win.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_win.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp index 457a6215a..457a6215a 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h index 9e562d3cf..e7099c115 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h @@ -23,7 +23,7 @@ #ifndef __KDTOOLS_RUNONCECHECKER_H__ #define __KDTOOLS_RUNONCECHECKER_H__ -#include <KDToolsCore/pimpl_ptr> +#include <pimpl_ptr.h> #include <QtCore/QString> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.cpp index 38a4b87bf..38a4b87bf 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h index 94170608c..2dad832e8 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h @@ -23,8 +23,8 @@ #ifndef __KDTOOLSCORE_KDSAVEFILE_H__ #define __KDTOOLSCORE_KDSAVEFILE_H__ -#include <KDToolsCore/kdtoolsglobal.h> -#include <KDToolsCore/pimpl_ptr.h> +#include <kdtoolsglobal.h> +#include <pimpl_ptr.h> #include <QtCore/QIODevice> #include <QtCore/QFile> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.cpp index fcd66f238..fcd66f238 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h index 0582c778d..511cf042e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h @@ -23,7 +23,7 @@ #ifndef __KDTOOLSCORE_KDSELFRESTARTER_H__ #define __KDTOOLSCORE_KDSELFRESTARTER_H__ -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> class KDTOOLSCORE_EXPORT KDSelfRestarter { public: diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp index 55b0519db..55b0519db 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h index 8cb6868a9..69acabf81 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h @@ -23,7 +23,7 @@ #ifndef KDSYSINFO_H #define KDSYSINFO_H -#include <KDToolsCore/kdtoolsglobal.h> +#include <kdtoolsglobal.h> #include <QtCore/QString> #include <QtCore/QSysInfo> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_mac.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp index a8d62425c..a8d62425c 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_mac.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_win.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp index 86d152431..86d152431 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_win.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_x11.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp index f54f63c8e..f54f63c8e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_x11.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater.pri b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri index 72a59e482..663c62434 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater.pri +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri @@ -1,10 +1,31 @@ DEPENDPATH += $$PWD INCLUDEPATH += $$PWD -CONFIG( shared, static|shared) { +CONFIG(shared, static|shared) { + DEFINES += BUILD_SHARED_KDTOOLSCORE DEFINES += BUILD_SHARED_KDUPDATER } +HEADERS += $$PWD/pimpl_ptr.h \ + $$PWD/kdtoolsglobal.h \ + $$PWD/kdjob.h \ + $$PWD/kdgenericfactory.h \ + $$PWD/kdselfrestarter.h \ + $$PWD/kdsavefile.h \ + $$PWD/kdrunoncechecker.h \ + $$PWD/kdlockfile.h \ + $$PWD/kdsysinfo.h + +SOURCES += $$PWD/pimpl_ptr.cpp \ + $$PWD/kdjob.cpp \ + $$PWD/kdgenericfactory.cpp \ + $$PWD/kdselfrestarter.cpp \ + $$PWD/kdsavefile.cpp \ + $$PWD/kdrunoncechecker.cpp \ + $$PWD/kdlockfile.cpp \ + $$PWD/kdsysinfo.cpp + + HEADERS += $$PWD/kdupdater.h \ $$PWD/kdupdaterapplication.h \ $$PWD/kdupdatercrypto.h \ @@ -51,8 +72,15 @@ SOURCES += $$PWD/kdupdaterapplication.cpp \ QT += gui +unix:SOURCES += $$PWD/kdlockfile_unix.cpp +win32:SOURCES += $$PWD/kdlockfile_win.cpp +win32:SOURCES += $$PWD/kdsysinfo_win.cpp +macx:SOURCES += $$PWD/kdsysinfo_mac.cpp +unix:!macx:SOURCES += $$PWD/kdsysinfo_x11.cpp + + TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH -win32:TRY_INCLUDEPATHS += $$PWD/../../openssl-0.9.8k/src/include +win32:TRY_INCLUDEPATHS += $$PWD/../openssl-0.9.8k/src/include linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH for(p, TRY_INCLUDEPATHS) { pp = $$join(p, "", "", "/openssl") diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdtoolsglobal.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h index 8d94425d5..8d94425d5 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdtoolsglobal.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdater.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h index 9e0007155..9e0007155 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdater.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.cpp index cf4379c90..cf4379c90 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h index 1d0fca6d9..1d0fca6d9 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.cpp index b5808c9c2..b5808c9c2 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h index 4d94c89fb..426b1fa81 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h @@ -25,7 +25,7 @@ #include "kdupdater.h" -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> QT_BEGIN_NAMESPACE class QByteArray; diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp index 2ff1e9a4d..2ff1e9a4d 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h index def79a236..0bf2060b3 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h @@ -24,7 +24,7 @@ #define KD_UPDATER_FILE_DOWNLOADER_H #include "kdupdater.h" -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> #include <QtCore/QObject> #include <QtCore/QUrl> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader_p.h index 452fdbe59..94447334a 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader_p.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader_p.h @@ -24,7 +24,7 @@ #define KD_UPDATER_FILE_DOWNLOADER_P_H #include "kdupdaterfiledownloader.h" -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> #include <QtCore/QCryptographicHash> #include <QtNetwork/QNetworkReply> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.cpp index cba271e96..cba271e96 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h index 7afc3e35e..4c09f4173 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h @@ -24,8 +24,8 @@ #define KD_UPDATER_FILE_DOWNLOADER_FACTORY_H #include "kdupdater.h" -#include <KDToolsCore/pimpl_ptr.h> -#include <KDToolsCore/kdgenericfactory.h> +#include <pimpl_ptr.h> +#include <kdgenericfactory.h> #include <QtCore/QStringList> #include <QtCore/QUrl> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp index 8a079ec9b..8a079ec9b 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h index d0a7ae31c..d0a7ae31c 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.cpp index 0b1f61a57..0b1f61a57 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h index 6d426c820..6d426c820 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.cpp index 19c6337e4..19c6337e4 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.h index bbad15381..72d8cd88a 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.h @@ -23,7 +23,7 @@ #ifndef KDUPDATERSIGNATUREVERIFICATIONJOB_H #define KDUPDATERSIGNATUREVERIFICATIONJOB_H -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> #include <QtCore/QGenericArgument> #include <QtCore/QRunnable> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.cpp index 28cba7098..28cba7098 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h index ef1da8ae3..ef1da8ae3 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.cpp index 6297594c0..6297594c0 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h index 311fd84cd..311fd84cd 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon.cpp index 4a93b92c2..4a93b92c2 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h index 6501735f1..e3edc943b 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h @@ -25,7 +25,7 @@ #define KD_UPDATER_UF_HEADER_MAGIC "KDVCLZ" -#include <KDToolsCore/kdtoolsglobal.h> +#include <kdtoolsglobal.h> #include <QtCore/QStringList> #include <QtCore/QByteArray> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp index f5c36e44f..f5c36e44f 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h index 61c5cca78..8f9f55356 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor_p.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h @@ -23,7 +23,7 @@ #ifndef __KDTOOLS_KDUPDATERUFUNCOMPRESSOR_P_H__ #define __KDTOOLS_KDUPDATERUFUNCOMPRESSOR_P_H__ -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> #include <QtCore/QCoreApplication> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp index 0761e7926..0761e7926 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h index 4e4c711d6..4e4c711d6 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp index 551a81f46..551a81f46 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h index e472f42e0..e472f42e0 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.cpp index 3b8d2dbd4..3b8d2dbd4 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h index dc3e58e48..dc3e58e48 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.cpp index 7c4121e8e..7c4121e8e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h index 53111d23a..53111d23a 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.cpp index 076af5273..076af5273 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h index d42a871c3..915d4968d 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h @@ -23,10 +23,10 @@ #ifndef KD_UPDATER_UPDATE_OPERATION_FACTORY_H #define KD_UPDATER_UPDATE_OPERATION_FACTORY_H -#include <KDToolsCore/kdgenericfactory.h> +#include <kdgenericfactory.h> #include "kdupdater.h" -#include <KDToolsCore/pimpl_ptr.h> +#include <pimpl_ptr.h> namespace KDUpdater { diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp index 29fb254d9..29fb254d9 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h index 4f1a2563e..4f1a2563e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp index b707e7720..b707e7720 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo_p.h index 4179e3d8d..4179e3d8d 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo_p.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo_p.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp index 14a765a5b..14a765a5b 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h index 231002ee0..231002ee0 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.cpp index 1a7f017a1..1a7f017a1 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.cpp diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.h b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.h index 389e9bd69..fa0043217 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.h @@ -23,7 +23,7 @@ #ifndef __KDTOOLSCORE__PIMPL_PTR_H__ #define __KDTOOLSCORE__PIMPL_PTR_H__ -#include <KDToolsCore/kdtoolsglobal.h> +#include <kdtoolsglobal.h> #ifndef DOXYGEN_RUN namespace kdtools { |