diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
| commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
| tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /src/controls/plugin.cpp | |
| parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
| parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
| download | qtquickcontrols-8b36cdd25761348c285305edec1bf861a924e858.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'src/controls/plugin.cpp')
| -rw-r--r-- | src/controls/plugin.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 257b1381..5a5a9605 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -75,8 +75,6 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Controls); -#else - Q_INIT_RESOURCE(controls); #endif } |