Make tools compile again.

Change-Id: Ie9cfeca59450b7d9f31e5002a50b5c95150d8bed
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

8 files changed, 35 insertions, 36 deletions

diff --git a/tools/getrepositorycontent/getrepositorycontent.pro b/tools/getrepositorycontent/getrepositorycontent.pro
index 46a6efd13..10433f209 100644
--- a/tools/getrepositorycontent/getrepositorycontent.pro
+++ b/tools/getrepositorycontent/getrepositorycontent.pro
@@ -5,7 +5,7 @@ TARGET = getrepositorycontent
 include(../../installerfw.pri)
 
 QT -= gui
-QT += network
+QT += network xml
 
 CONFIG += console
 DESTDIR = $$IFW_APP_PATH
diff --git a/tools/getrepositorycontent/main.cpp b/tools/getrepositorycontent/main.cpp
index 671f07ab0..f91d30934 100644
--- a/tools/getrepositorycontent/main.cpp
+++ b/tools/getrepositorycontent/main.cpp
@@ -445,7 +445,7 @@ int main(int argc, char *argv[])
                 QUrl downloadUrl((QStringList() << repositoryUrl << itComponentData.key() << itComponentData.value().m_version + sevenZString).join(QLatin1String("/")));
                 QString localRepositoryTarget = dataRepositoryPath + QLatin1Char('/') + itComponentData.value().m_version + sevenZString;
                 downloadFile(downloadUrl, localRepositoryTarget);
-                downloadFile(downloadUrl.toString() + QLatin1String(".sha1"), localRepositoryTarget + QLatin1String(".sha1"));
+                downloadFile(QUrl(downloadUrl.toString() + QLatin1String(".sha1")), localRepositoryTarget + QLatin1String(".sha1"));
                 QFile::copy(localRepositoryTarget, dataPackagesPath + QLatin1Char('/') + sevenZString);
             }
         }
diff --git a/tools/repocompare/main.cpp b/tools/repocompare/main.cpp
index 6e646c9c9..c10f00385 100644
--- a/tools/repocompare/main.cpp
+++ b/tools/repocompare/main.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 **************************************************************************/
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QTimer>
 #include <QtCore>
 #include "mainwindow.h"
diff --git a/tools/repocompare/mainwindow.cpp b/tools/repocompare/mainwindow.cpp
index 2d6145a45..b97fb9e6b 100644
--- a/tools/repocompare/mainwindow.cpp
+++ b/tools/repocompare/mainwindow.cpp
@@ -40,17 +40,17 @@
 **************************************************************************/
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include <QtCore/QFile>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QMapIterator>
-#include <QtCore/QTextStream>
-#include <QtCore/QUrl>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QSettings>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
+#include <QFile>
+#include <QTemporaryFile>
+#include <QMapIterator>
+#include <QTextStream>
+#include <QUrl>
+#include <QXmlStreamReader>
+#include <QSettings>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 
 namespace {
 const QLatin1String productionIdentifier = QLatin1String("ProductionRepositories");
diff --git a/tools/repocompare/mainwindow.h b/tools/repocompare/mainwindow.h
index 4bc3ccae8..debef054b 100644
--- a/tools/repocompare/mainwindow.h
+++ b/tools/repocompare/mainwindow.h
@@ -42,13 +42,13 @@
 #define MAINWINDOW_H
 
 #include "repositorymanager.h"
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QUrl>
-#include <QtCore/QDate>
-#include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtGui/QMainWindow>
-#include <QtNetwork/QNetworkAccessManager>
+#include <QTemporaryFile>
+#include <QUrl>
+#include <QDate>
+#include <QString>
+#include <QMap>
+#include <QMainWindow>
+#include <QNetworkAccessManager>
 
 namespace Ui {
     class MainWindow;
diff --git a/tools/repocompare/repocompare.pro b/tools/repocompare/repocompare.pro
index 04f50dc5a..a7117f775 100644
--- a/tools/repocompare/repocompare.pro
+++ b/tools/repocompare/repocompare.pro
@@ -4,8 +4,7 @@ TARGET = repocompare
 
 include(../../installerfw.pri)
 
-QT += network
-DESTDIR = $$IFW_APP_PATH
+QT += widgets network
 
 SOURCES += main.cpp\
         mainwindow.cpp \
@@ -16,4 +15,4 @@ HEADERS += mainwindow.h \
 
 FORMS += mainwindow.ui
 
-macx:include(../../no_app_bundle.pri)
+osx:include(../../no_app_bundle.pri)
diff --git a/tools/repocompare/repositorymanager.cpp b/tools/repocompare/repositorymanager.cpp
index 90077e280..d23041690 100644
--- a/tools/repocompare/repositorymanager.cpp
+++ b/tools/repocompare/repositorymanager.cpp
@@ -40,14 +40,14 @@
 **************************************************************************/
 #include "repositorymanager.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QXmlStreamReader>
-#include <QtGui/QMessageBox>
+#include <QDebug>
+#include <QFile>
+#include <QStringList>
+#include <QUrl>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QXmlStreamReader>
+#include <QMessageBox>
 
 namespace {
 qreal createVersionNumber(const QString &text)
diff --git a/tools/repocompare/repositorymanager.h b/tools/repocompare/repositorymanager.h
index ab73420bc..bdc0d5c3e 100644
--- a/tools/repocompare/repositorymanager.h
+++ b/tools/repocompare/repositorymanager.h
@@ -41,10 +41,10 @@
 #ifndef REPOSITORYMANAGER_H
 #define REPOSITORYMANAGER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QDate>
-#include <QtNetwork/QNetworkAccessManager>
+#include <QObject>
+#include <QMap>
+#include <QDate>
+#include <QNetworkAccessManager>
 
 struct ComponentDescription {
     QString version;