Am 05.01.2014 21:05, schrieb John Paul Adrian Glaubitz:
This patch currently doesn't apply to git master: 0001-remove-QtCore-from-the-include-directives-let-qmake-.patch The best would be to fix the last patch first since it introduces changes suggested by Michael.
O.K., here is the fixed patch. Thomas
>From ea2f236742fae52d2f400ab9c8927563c140f5b8 Mon Sep 17 00:00:00 2001 From: Thomas Arp <manner.moe@gmx.de> Date: Sun, 5 Jan 2014 22:20:34 +0100 Subject: [PATCH] remove "QtCore" from the include directives, add QT+=core in the project file instead --- qhimdtransfer/main.cpp | 4 ++-- qhimdtransfer/qhimddetection.cpp | 2 +- qhimdtransfer/qhimdmainwindow.h | 2 +- qhimdtransfer/qhimdtransfer.pro | 2 +- qhimdtransfer/qhimdwindetection.cpp | 4 ++-- qhimdtransfer/qmdmodel.h | 6 +++--- qhimdtransfer/qmdtrack.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qhimdtransfer/main.cpp b/qhimdtransfer/main.cpp index e7a3e2f..b07dfa3 100644 --- a/qhimdtransfer/main.cpp +++ b/qhimdtransfer/main.cpp @@ -1,6 +1,6 @@ #include <QApplication> -#include <QtCore/QTranslator> -#include <QtCore/QLocale> +#include <QTranslator> +#include <QLocale> #include "qhimdmainwindow.h" /* stolen from Qt Creator */ diff --git a/qhimdtransfer/qhimddetection.cpp b/qhimdtransfer/qhimddetection.cpp index e73dc03..0e6fd04 100644 --- a/qhimdtransfer/qhimddetection.cpp +++ b/qhimdtransfer/qhimddetection.cpp @@ -1,4 +1,4 @@ -#include <QtCore/QDebug> +#include <QDebug> #include "qhimddetection.h" void QHiMDDetection::clearDeviceList() diff --git a/qhimdtransfer/qhimdmainwindow.h b/qhimdtransfer/qhimdmainwindow.h index a462f84..3794d4f 100644 --- a/qhimdtransfer/qhimdmainwindow.h +++ b/qhimdtransfer/qhimdmainwindow.h @@ -3,7 +3,7 @@ #include <QMainWindow> #include <QFileDialog> -#include <QtCore/QSettings> +#include <QSettings> #include "qhimdaboutdialog.h" #include "qhimdformatdialog.h" #include "qhimddetection.h" diff --git a/qhimdtransfer/qhimdtransfer.pro b/qhimdtransfer/qhimdtransfer.pro index 0fc2de1..94125ff 100644 --- a/qhimdtransfer/qhimdtransfer.pro +++ b/qhimdtransfer/qhimdtransfer.pro @@ -7,7 +7,7 @@ DEPENDPATH += . INCLUDEPATH += . # for Qt5 compatibility -QT += gui +QT += gui core greaterThan(QT_MAJOR_VERSION, 4): QT += widgets # determine version number from git diff --git a/qhimdtransfer/qhimdwindetection.cpp b/qhimdtransfer/qhimdwindetection.cpp index f5a9d0c..6502dd0 100644 --- a/qhimdtransfer/qhimdwindetection.cpp +++ b/qhimdtransfer/qhimdwindetection.cpp @@ -1,5 +1,5 @@ -#include <QtCore/QDebug> -#include <QtCore/QList> +#include <QDebug> +#include <QList> #include <QWidget> #include "qhimddetection.h" diff --git a/qhimdtransfer/qmdmodel.h b/qhimdtransfer/qmdmodel.h index bb8ec97..20f65fd 100644 --- a/qhimdtransfer/qmdmodel.h +++ b/qhimdtransfer/qmdmodel.h @@ -1,10 +1,10 @@ #ifndef QMDMODEL_H #define QMDMODEL_H -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> -#include <QtCore/QList> -#include <QtCore/QStringList> +#include <QList> +#include <QStringList> #include <QFileSystemModel> #include <qmddevice.h> diff --git a/qhimdtransfer/qmdtrack.h b/qhimdtransfer/qmdtrack.h index 0ac7e43..569842b 100644 --- a/qhimdtransfer/qmdtrack.h +++ b/qhimdtransfer/qmdtrack.h @@ -1,7 +1,7 @@ #ifndef QMDTRACK_H #define QMDTRACK_H -#include <QtCore/QTime> +#include <QTime> #include "himd.h" #include "sony_oma.h" -- 1.7.10.4