Merge remote-tracking branch 'origin/4.10'

Change-Id: I273a1e8f5f9e54756befbc398c2c2754534ff128
This commit is contained in:
Eike Ziller
2019-08-09 09:43:16 +02:00
59 changed files with 2243 additions and 680 deletions

View File

@@ -34,7 +34,7 @@
#include <QSharedPointer>
#include <QWeakPointer>
#include "enumeration.h"
#include <enumeration.h>
QT_BEGIN_NAMESPACE
class QQmlContext;