diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:10:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:10:59 +0100 |
commit | ef9c5632235511276d16d7d9e23edf2074aa3fce (patch) | |
tree | 71109d8f8a23bd6864a26738660dd757eee8753c /src | |
parent | 1320f7f9840e94db66988f2dce265dfd373add27 (diff) | |
parent | a6d21e484a4d0f3308dbdb157e602ab5965bccf3 (diff) | |
download | qtquickcontrols-ef9c5632235511276d16d7d9e23edf2074aa3fce.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I89e5f9b74a7657d315334414ea0447f658024841
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/plugin.cpp | 1 |
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 } |