Commit 0aecf9c1 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.1' into 3.2

Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
parents 70593535 34d89716
......@@ -30,6 +30,7 @@
#include "addimportcontainer.h"
#include <QDebug>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -38,6 +38,7 @@
#include <QStack>
#include <QList>
#include <QVector>
#include <QMetaObject>
QT_BEGIN_NAMESPACE
class QTextDocument;
......
......@@ -34,6 +34,7 @@
#include <QString>
#include <QColor>
#include <QWidget>
namespace Utils {
......
......@@ -30,6 +30,7 @@
#include "qtlocalpeer.h"
#include <QCoreApplication>
#include <QDataStream>
#include <QTime>
#if defined(Q_OS_WIN)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment