summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:12 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:12 +0100
commit87859b2aecbecdab8fd001e3a52887980b0735e8 (patch)
tree05b5ff0507643cfb734914d5c079afd13bbcff27 /src
parent5b036c7b75b187838ff8e96141b163bba6477509 (diff)
parent48e60b9b0a6fd2e9c1a548b1ca79bd5b81e93dd2 (diff)
downloadqtquickcontrols-87859b2aecbecdab8fd001e3a52887980b0735e8.tar.gz
Merge 5.10 into 5.10.0
Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
Diffstat (limited to 'src')
-rw-r--r--src/controls/plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 5a5a9605..f78098ec 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -75,6 +75,7 @@ static void initResources()
{
#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_QtQuick_Controls);
+ Q_INIT_RESOURCE(qmake_controls);
#endif
}