summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-11-15 08:10:59 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-11-15 08:10:59 (GMT)
commitef9c5632235511276d16d7d9e23edf2074aa3fce (patch)
tree71109d8f8a23bd6864a26738660dd757eee8753c
parent1320f7f9840e94db66988f2dce265dfd373add27 (diff)
parenta6d21e484a4d0f3308dbdb157e602ab5965bccf3 (diff)
downloadqtquickcontrols-ef9c5632235511276d16d7d9e23edf2074aa3fce.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I89e5f9b74a7657d315334414ea0447f658024841
-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 5a5a960..f78098e 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
}