fixed compile errors caused by inconsistencies between merged branches

This commit is contained in:
Mathew Sutcliffe
2013-08-29 00:02:47 +01:00
parent 20c33bf77c
commit a011bb18e6
6 changed files with 7 additions and 10 deletions

View File

@@ -10,7 +10,7 @@
#include "blackmisc/debug.h"
#include "blackmisc/mathematics.h"
#include <QCoreApplication>
#include <QDBusArgument>
#include <QtDBus/QDBusArgument>
#include <QString>
#include <QtGlobal>
#include <QDebug>

View File

@@ -10,7 +10,7 @@
#include "blackmisc/pqbase.h"
#include "blackmisc/pqunits.h"
#include "blackmisc/debug.h"
#include <QDBusMetaType>
#include <QtDBus/QDBusMetaType>
#include <QtGlobal>
#include <QString>
#include <QLocale>

View File

@@ -7,7 +7,7 @@
#define BLACKMISC_PQUNITS_H
#include "blackmisc/pqbase.h"
#include <QDBusArgument>
#include <QtDBus/QDBusArgument>
#include <QList>
#include <QtCore/qmath.h>
#include <QTranslator>

View File

@@ -2,7 +2,7 @@
#define BLACKMISC_STREAMABLE_H
#include "blackmisc/debug.h"
#include <QDBusMetaType>
#include <QtDBus/QDBusMetaType>
#include <QString>
#include <QtGlobal>
#include <QDataStream>