mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-09 05:28:09 +08:00
fixed compile errors caused by inconsistencies between merged branches
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define BLACKMISC_STREAMABLE_H
|
||||
|
||||
#include "blackmisc/debug.h"
|
||||
#include <QDBusMetaType>
|
||||
#include <QtDBus/QDBusMetaType>
|
||||
#include <QString>
|
||||
#include <QtGlobal>
|
||||
#include <QDataStream>
|
||||
|
||||
Reference in New Issue
Block a user