summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/3rdparty/7zip
diff options
context:
space:
mode:
Diffstat (limited to 'installerbuilder/libinstaller/3rdparty/7zip')
-rw-r--r--installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp8
-rw-r--r--installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h24
2 files changed, 16 insertions, 16 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp
index 285f9bbbb..c679572fd 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp
+++ b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp
@@ -1,7 +1,10 @@
#include "lib7z_facade.h"
+#include "errors.h"
+#include "fileutils.h"
+
#ifndef Q_OS_WIN
-#include "StdAfx.h"
+# include "StdAfx.h"
#endif
#include "Common/MyInitGuid.h"
@@ -36,9 +39,6 @@
#include "Windows/PropVariant.h"
#include "Windows/PropVariantConversions.h"
-#include <common/errors.h>
-#include <common/fileutils.h>
-
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtCore/QDir>
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h
index 855648aa2..58774df11 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h
+++ b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h
@@ -1,21 +1,21 @@
#ifndef LIB7Z_FACADE_H
#define LIB7Z_FACADE_H
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QFile>
-#include <QString>
-#include <QRunnable>
-#include <QVector>
-#include <QVariant>
-#include <QPoint>
-
-#include <stdexcept>
-#include <string>
+#include "installer_global.h"
#include "Common/MyWindows.h"
-#include "../../installerbuilder/libinstaller/installer_global.h"
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QFile>
+#include <QtCore/QPoint>
+#include <QtCore/QRunnable>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtCore/QVariant>
+
+#include <stdexcept>
+#include <string>
QT_BEGIN_NAMESPACE
class QStringList;