diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-03 10:07:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-03 13:34:23 +0000 |
| commit | 58bea5210dff23e0e125e91e94e1f933d8329521 (patch) | |
| tree | 573c8d8823b7016c08beaef84307f941c221eb53 | |
| parent | 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 (diff) | |
| download | qtquickcontrols-58bea5210dff23e0e125e91e94e1f933d8329521.tar.gz | |
Remove spurious Q_INIT_RESOURCE calls
These explicit resource initialization calls are only needed when
linking statically.
Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/dialogs/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/extras/plugin.cpp | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 8a79cbe3..bac0d64d 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 } diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 5a13bc9b..a2fb1099 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -66,8 +66,6 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Dialogs); -#else - Q_INIT_RESOURCE(dialogs); #endif } diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index a9e23321..2f58510b 100644 --- a/src/extras/plugin.cpp +++ b/src/extras/plugin.cpp @@ -50,9 +50,7 @@ static void initResources() { -#ifndef QT_STATIC - Q_INIT_RESOURCE(extras); -#else +#ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Extras); #endif } |