diff options
| author | Jochen Seemann <seemann.jochen@gmail.com> | 2015-11-26 17:24:03 +0100 |
|---|---|---|
| committer | Jochen Seemann <seemann.jochen@gmail.com> | 2015-11-27 16:21:08 +0000 |
| commit | 395e255873fd15a74d2ea99379b917b632ce65d6 (patch) | |
| tree | 53bfa36550832a75276d3cb9f98b554ffd328264 /src/imports/controls/universal | |
| parent | 0ac6b52cb987e2c2e1d6280bc0505d5c63f43d34 (diff) | |
fix linking / usage on iOS
Using QtQC2 in an application on iOS was failing during linking with:
duplicate symbol __Z13initResourcesv in:
.../controls/libqtlabscontrolsplugin_iphonesimulator.a(qtlabscontrolsplugin.o)
.../controls/material/libqtlabsmaterialstyleplugin_iphonesimulator.a(qtlabsmaterialstyleplugin.o)
duplicate symbol __Z13initResourcesv in:
.../controls/libqtlabscontrolsplugin_iphonesimulator.a(qtlabscontrolsplugin.o)
.../controls/universal/libqtlabsuniversalstyleplugin_iphonesimulator.a(qtlabsuniversalstyleplugin.o)
Making initResources() static inline as intended.
Change-Id: I340b5eb711aaa195f4110f049bcc3a6eb84341cc
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 12faa564..9b760250 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -40,7 +40,7 @@ #include "qquickuniversalprogressstrip_p.h" #include "qquickuniversalstyle_p.h" -void initResources() +static inline void initResources() { Q_INIT_RESOURCE(qtlabsuniversalstyleplugin); } |