diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-19 15:57:34 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-19 15:59:03 +0200 |
| commit | d7991f67ffa5708ff1b2a657cb49c9a538d2bfc9 (patch) | |
| tree | 3607211046b70b00f9036a61af8b9798740190eb /src | |
| parent | 79bcab5c2a2be73d20364e7ccd718856659510cc (diff) | |
| parent | cba93d8dea82ee2a5d2cf98f2ad6d8dd43b14d7e (diff) | |
Merge branch 'develop'
Change-Id: Ic97fe9c9e7e12acb86a9798326cfff30d09a229b
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 37baee8a..fba82282 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -37,7 +37,7 @@ #include <QtCore/QPointer> #include <QtCore/QThread> -#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) +#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT) #define USE_SHARED_CONTEXT #endif |