diff options
Diffstat (limited to 'installerbuilder')
43 files changed, 54 insertions, 88 deletions
diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp index 0b69f875b..3449ff10e 100644 --- a/installerbuilder/binarycreator/binarycreator.cpp +++ b/installerbuilder/binarycreator/binarycreator.cpp @@ -39,8 +39,7 @@ #include <init.h> #include <settings.h> -#include <KDToolsCore/KDSaveFile> -#include <KDUpdater/KDUpdater> +#include <KDToolsCore/kdsavefile.h> #include <QCoreApplication> #include <QDebug> diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp index 4fc8307b4..a9412482f 100644 --- a/installerbuilder/common/binaryformat.cpp +++ b/installerbuilder/common/binaryformat.cpp @@ -38,7 +38,7 @@ #include "utils.h" #include "zipjob.h" -#include <KDUpdater/UpdateOperationFactory> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> #include <QtCore/QResource> #include <QtCore/QTemporaryFile> diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp index 6d7668e19..13521c10e 100644 --- a/installerbuilder/common/repositorygen.cpp +++ b/installerbuilder/common/repositorygen.cpp @@ -38,8 +38,6 @@ #include <common/consolepasswordprovider.h> #include <settings.h> -#include <KDUpdater/KDUpdater> - #include <QCryptographicHash> #include <QDir> #include <QDirIterator> diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index 8762891da..03af930ac 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -49,8 +49,8 @@ #include <settings.h> #include <updater.h> -#include <KDToolsCore/KDSelfRestarter> -#include <KDToolsCore/KDRunOnceChecker> +#include <KDToolsCore/kdselfrestarter.h> +#include <KDToolsCore/kdrunoncechecker.h> #include <QtCore/QTranslator> diff --git a/installerbuilder/installerbase/installerbase_p.cpp b/installerbuilder/installerbase/installerbase_p.cpp index bf62de104..d335921ef 100644 --- a/installerbuilder/installerbase/installerbase_p.cpp +++ b/installerbuilder/installerbase/installerbase_p.cpp @@ -39,10 +39,10 @@ #include <lib7z_facade.h> #include <qprocesswrapper.h> -#include <KDUpdater/FileDownloader> -#include <KDUpdater/FileDownloaderFactory> +#include <KDUpdater/kdupdaterfiledownloader.h> +#include <KDUpdater/kdupdaterfiledownloaderfactory.h> -#include <KDToolsCore/KDSaveFile> +#include <KDToolsCore/kdsavefile.h> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDGenericFactory b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDGenericFactory deleted file mode 100644 index 42f06640a..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDGenericFactory +++ /dev/null @@ -1 +0,0 @@ -#include "kdgenericfactory.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDJob b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDJob deleted file mode 100644 index 79fd1dde9..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDJob +++ /dev/null @@ -1 +0,0 @@ -#include "kdjob.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDLockfile b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDLockfile deleted file mode 100644 index afd9f7ad1..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDLockfile +++ /dev/null @@ -1 +0,0 @@ -#include "kdlockfile.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDRunOnceChecker b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDRunOnceChecker deleted file mode 100644 index d5ccad881..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDRunOnceChecker +++ /dev/null @@ -1 +0,0 @@ -#include "kdrunoncechecker.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSaveFile b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSaveFile deleted file mode 100644 index f7df3f1b5..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSaveFile +++ /dev/null @@ -1 +0,0 @@ -#include "kdsavefile.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSelfRestarter b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSelfRestarter deleted file mode 100644 index 7de1c2779..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSelfRestarter +++ /dev/null @@ -1 +0,0 @@ -#include "kdselfrestarter.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSysInfo b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSysInfo deleted file mode 100644 index 7d5cec1e4..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDSysInfo +++ /dev/null @@ -1 +0,0 @@ -#include "kdsysinfo.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Application b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Application deleted file mode 100644 index 7545e9447..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Application +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterapplication.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloader b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloader deleted file mode 100644 index beca4f9c1..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloader +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterfiledownloader.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloaderFactory b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloaderFactory deleted file mode 100644 index 65dbb7a4e..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/FileDownloaderFactory +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterfiledownloaderfactory.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater deleted file mode 100644 index 3de5e736c..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater +++ /dev/null @@ -1,17 +0,0 @@ -#include "kdupdater.h" -#include "kdupdaterapplication.h" -#include "kdupdatercrypto.h" -#include "kdupdaterfiledownloader.h" -#include "kdupdaterfiledownloaderfactory.h" -#include "kdupdaterpackagesinfo.h" -#include "kdupdatersignatureverificationresult.h" -#include "kdupdatersignatureverificationrunnable.h" -#include "kdupdatersignatureverifier.h" -#include "kdupdatertask.h" -#include "kdupdaterupdate.h" -#include "kdupdaterupdatefinder.h" -#include "kdupdaterupdateinstaller.h" -#include "kdupdaterupdateoperation.h" -#include "kdupdaterupdateoperationfactory.h" -#include "kdupdaterupdateoperations.h" -#include "kdupdaterupdatesourcesinfo.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/PackagesInfo b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/PackagesInfo deleted file mode 100644 index 8e709882d..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/PackagesInfo +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterpackagesinfo.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerificationResult b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerificationResult deleted file mode 100644 index 5a71cdfde..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerificationResult +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdatersignatureverificationresult.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerifier b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerifier deleted file mode 100644 index 3d9d7f946..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/SignatureVerifier +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdatersignatureverifier.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Update b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Update deleted file mode 100644 index 8328b020b..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/Update +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterupdate.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateFinder b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateFinder deleted file mode 100644 index 71666b90d..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateFinder +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterupdatefinder.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperation b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperation deleted file mode 100644 index fd82bafdb..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperation +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterupdateoperation.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperationFactory b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperationFactory deleted file mode 100644 index bd13c19c5..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateOperationFactory +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterupdateoperationfactory.h" diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateSourcesInfo b/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateSourcesInfo deleted file mode 100644 index b422ec594..000000000 --- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/UpdateSourcesInfo +++ /dev/null @@ -1 +0,0 @@ -#include "kdupdaterupdatesourcesinfo.h" diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp index 35128073f..ca7e43b01 100644 --- a/installerbuilder/libinstaller/component.cpp +++ b/installerbuilder/libinstaller/component.cpp @@ -41,8 +41,8 @@ #include "qinstallerglobal.h" #include "messageboxhandler.h" -#include <KDUpdater/UpdateSourcesInfo> -#include <KDUpdater/UpdateOperationFactory> +#include <KDUpdater/kdupdaterupdatesourcesinfo.h> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> #include <QtCore/QDirIterator> #include <QtCore/QTranslator> diff --git a/installerbuilder/libinstaller/createshortcutoperation.cpp b/installerbuilder/libinstaller/createshortcutoperation.cpp index 4cd221ab8..66ccd2b2f 100644 --- a/installerbuilder/libinstaller/createshortcutoperation.cpp +++ b/installerbuilder/libinstaller/createshortcutoperation.cpp @@ -31,8 +31,8 @@ ** **************************************************************************/ -#include <KDUpdater/Application> -#include <KDUpdater/PackagesInfo> +#include <KDUpdater/kdupdaterapplication.h> +#include <KDUpdater/kdupdaterpackagesinfo.h> #include "createshortcutoperation.h" #include "common/errors.h" diff --git a/installerbuilder/libinstaller/cryptosignatureverifier.h b/installerbuilder/libinstaller/cryptosignatureverifier.h index 096c6536e..b01297314 100644 --- a/installerbuilder/libinstaller/cryptosignatureverifier.h +++ b/installerbuilder/libinstaller/cryptosignatureverifier.h @@ -23,13 +23,14 @@ ** (qt-info@nokia.com). ** **************************************************************************/ + #ifndef CRYPTOSIGNATUREVERIFIER_H #define CRYPTOSIGNATUREVERIFIER_H #include "KDUpdater/kdupdatercrypto.h" -#include <KDUpdater/SignatureVerifier> -#include <KDUpdater/SignatureVerificationResult> +#include <KDUpdater/kdupdatersignatureverifier.h> +#include <KDUpdater/kdupdatersignatureverificationresult.h> class CryptoSignatureVerifier : public KDUpdater::SignatureVerifier diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp index 67f12bc5a..1893f440e 100644 --- a/installerbuilder/libinstaller/downloadarchivesjob.cpp +++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp @@ -39,8 +39,8 @@ #include "messageboxhandler.h" #include "packagemanagercore.h" -#include <KDUpdater/FileDownloader> -#include <KDUpdater/FileDownloaderFactory> +#include <KDUpdater/kdupdaterfiledownloader.h> +#include <KDUpdater/kdupdaterfiledownloaderfactory.h> #include <QtCore/QFile> #include <QtCore/QTimerEvent> diff --git a/installerbuilder/libinstaller/downloadarchivesjob.h b/installerbuilder/libinstaller/downloadarchivesjob.h index 0b4a5dba1..bb9c83d7a 100644 --- a/installerbuilder/libinstaller/downloadarchivesjob.h +++ b/installerbuilder/libinstaller/downloadarchivesjob.h @@ -26,7 +26,7 @@ #ifndef DOWNLOADARCHIVESJOB_H #define DOWNLOADARCHIVESJOB_H -#include <KDToolsCore/KDJob> +#include <KDToolsCore/kdjob.h> #include <QtCore/QPair> #include <QtCore/QSet> diff --git a/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp b/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp index 508604dbc..34e9f308f 100644 --- a/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp +++ b/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp @@ -30,10 +30,11 @@ ** (qt-info@nokia.com). ** **************************************************************************/ + #include "fakestopprocessforupdateoperation.h" -#include <QtCore/QDir> -#include <KDToolsCore/KDSysInfo> +#include <KDToolsCore/kdsysinfo.h> +#include <QtCore/QDir> #include <algorithm> diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h index d57dda39b..9b22cdaa5 100644 --- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h +++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h @@ -26,7 +26,7 @@ #ifndef GETREPOSITORIESMETAINFOJOB_H #define GETREPOSITORIESMETAINFOJOB_H -#include <KDToolsCore/KDJob> +#include <KDToolsCore/kdjob.h> #include <QtCore/QList> #include <QtCore/QPointer> diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp index 28d1fd77f..469e3f4ed 100644 --- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp +++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp @@ -40,8 +40,8 @@ #include "messageboxhandler.h" #include "qinstallerglobal.h" -#include <KDUpdater/FileDownloader> -#include <KDUpdater/FileDownloaderFactory> +#include <KDUpdater/kdupdaterfiledownloader.h> +#include <KDUpdater/kdupdaterfiledownloaderfactory.h> #include <QtCore/QFile> #include <QtCore/QTimer> diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.h b/installerbuilder/libinstaller/getrepositorymetainfojob.h index 32faa70dc..1f98dc1b7 100644 --- a/installerbuilder/libinstaller/getrepositorymetainfojob.h +++ b/installerbuilder/libinstaller/getrepositorymetainfojob.h @@ -26,7 +26,7 @@ #ifndef GETREPOSITORYMETAINFOJOB_H #define GETREPOSITORYMETAINFOJOB_H -#include <KDToolsCore/KDJob> +#include <KDToolsCore/kdjob.h> #include <QtCore/QPointer> #include <QtCore/QString> diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp index 89c36cfdd..c6a357e8f 100644 --- a/installerbuilder/libinstaller/init.cpp +++ b/installerbuilder/libinstaller/init.cpp @@ -76,9 +76,10 @@ #include <QtPlugin> -#include <KDUpdater/UpdateOperation> -#include <KDUpdater/UpdateOperationFactory> -#include <KDUpdater/FileDownloaderFactory> +#include <KDUpdater/kdupdaterupdateoperation.h> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> +#include <KDUpdater/kdupdaterfiledownloader.h> +#include <KDUpdater/kdupdaterfiledownloaderfactory.h> #include <QNetworkProxyFactory> diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp index 68abf55be..1296b9941 100644 --- a/installerbuilder/libinstaller/operationrunner.cpp +++ b/installerbuilder/libinstaller/operationrunner.cpp @@ -39,10 +39,8 @@ #include "init.h" #include "packagemanagercore.h" -#include <KDUpdater/UpdateOperation> -#include <KDUpdater/UpdateOperationFactory> - -#include <QtCore/QObject> +#include <KDUpdater/kdupdaterupdateoperation.h> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> #include <iostream> diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index 872bf4232..e52c2b620 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -55,8 +55,8 @@ #include <QtScript/QScriptEngine> #include <QtScript/QScriptContext> -#include <KDToolsCore/KDSysInfo> -#include <KDUpdater/UpdateOperationFactory> +#include <KDToolsCore/kdsysinfo.h> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> #ifdef Q_OS_WIN #include "qt_windows.h" diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index 88e3f2e5a..217cae9eb 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -45,9 +45,11 @@ #include "qprocesswrapper.h" #include "qsettingswrapper.h" -#include <KDToolsCore/KDSaveFile> -#include <KDToolsCore/KDSelfRestarter> -#include <KDUpdater/KDUpdater> +#include <KDToolsCore/kdsavefile.h> +#include <KDToolsCore/kdselfrestarter.h> +#include <KDUpdater/kdupdaterupdatesourcesinfo.h> +#include <KDUpdater/kdupdaterupdateoperationfactory.h> +#include <KDUpdater/kdupdaterupdatefinder.h> #include <QtCore/QtConcurrentRun> #include <QtCore/QCoreApplication> diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h index 85a1b6cb6..263538b1b 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.h +++ b/installerbuilder/libinstaller/packagemanagercore_p.h @@ -37,8 +37,8 @@ #include "settings.h" #include "packagemanagercore.h" -#include <KDToolsCore/KDSysInfo> -#include <KDUpdater/Application> +#include <KDToolsCore/kdsysinfo.h> +#include <KDUpdater/kdupdaterapplication.h> #include <QtCore/QHash> #include <QtCore/QObject> diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index d4a3afd8b..343eae272 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -46,7 +46,7 @@ #include "common/utils.h" #include "common/fileutils.h" -#include <KDToolsCore/KDSysInfo> +#include <KDToolsCore/kdsysinfo.h> #include <QtCore/QDir> #include <QtCore/QDynamicPropertyChangeEvent> diff --git a/installerbuilder/libinstaller/qinstallerglobal.h b/installerbuilder/libinstaller/qinstallerglobal.h index 60de3a249..f4ae848fe 100644 --- a/installerbuilder/libinstaller/qinstallerglobal.h +++ b/installerbuilder/libinstaller/qinstallerglobal.h @@ -28,9 +28,9 @@ #include <installer_global.h> -#include <KDUpdater/Update> -#include <KDUpdater/UpdateOperation> -#include <KDUpdater/PackagesInfo> +#include <KDUpdater/kdupdaterupdate.h> +#include <KDUpdater/kdupdaterupdateoperation.h> +#include <KDUpdater/kdupdaterpackagesinfo.h> QT_BEGIN_NAMESPACE class QScriptContext; diff --git a/installerbuilder/libinstaller/selfrestartoperation.cpp b/installerbuilder/libinstaller/selfrestartoperation.cpp index d53d8b254..79b028cf4 100644 --- a/installerbuilder/libinstaller/selfrestartoperation.cpp +++ b/installerbuilder/libinstaller/selfrestartoperation.cpp @@ -33,7 +33,7 @@ #include "selfrestartoperation.h" #include "packagemanagercore.h" -#include <KDToolsCore/KDSelfRestarter> +#include <KDToolsCore/kdselfrestarter.h> using namespace QInstaller; diff --git a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp index 9b95f577e..47b5eb76e 100644 --- a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp +++ b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp @@ -33,22 +33,23 @@ #include "environmentvariabletest.h" #include "environmentvariablesoperation.h" +#include "init.h" + +#include <KDUpdater/kdupdaterapplication.h> + #include <QDir> #include <QDirIterator> #include <QFileInfo> #include <QStack> #include <QSettings> -#include <KDUpdater/Application> - -#include "init.h" - EnvironmentVariableTest::EnvironmentVariableTest() { QInstaller::init(); } -void EnvironmentVariableTest::testPersistentNonSystem() { +void EnvironmentVariableTest::testPersistentNonSystem() +{ #ifndef Q_OS_WIN QSKIP("This operation only works on Windows",SkipSingle); #endif diff --git a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp index adcaa6b9e..4313a0c83 100644 --- a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp +++ b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp @@ -33,15 +33,15 @@ #include "extractarchiveoperationtest.h" #include "extractarchiveoperation.h" +#include "init.h" + +#include <KDUpdater/kdupdaterapplication.h> + #include <QDir> #include <QDirIterator> #include <QFileInfo> #include <QStack> -#include <KDUpdater/Application> - -#include "init.h" - ExtractArchiveOperationTest::ExtractArchiveOperationTest() { QInstaller::init(); |