summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-09-24 09:49:10 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-10-04 20:51:28 +0200
commitfeb51b94457691edbc58a34a9ddaf8b20c316820 (patch)
treec3758fa66a99f7d5bd5d4e6f0c06f3273a45693c /src
parenta79f70e2dfa1fa3d3a418310c7b8c8bb89c2d3c8 (diff)
downloadqtwebchannel-feb51b94457691edbc58a34a9ddaf8b20c316820.tar.gz
Fix static builds and building of tests
For static linkage we need to explicitly reference the plugin factory class, to prevent the linker from discarding the symbol. The Qt build system takes care of generating the necessary code for referencing the symbol and linking that reference into the application - see also qt.prf. For the build system to do this automatically, it needs to know the class name, which is stored in the qmldir file. This patch adds the missing class name. The first failure for this was when building the tests/auto/qml test, which specifies an IMPORTPATH that causes the qml import scanner to find the erroneous qmldir file and error out (see qt.prf). However otherwise this error would've appeared when trying to link an app on say iOS for example. Change-Id: Ia28307593e651d038ff1daaea7597f6eb5e40eb1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/webchannel/qmldir1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/webchannel/qmldir b/src/imports/webchannel/qmldir
index 17184fe..c521f2f 100644
--- a/src/imports/webchannel/qmldir
+++ b/src/imports/webchannel/qmldir
@@ -1,3 +1,4 @@
module QtWebChannel
+classname QWebChannelPlugin
plugin declarative_webchannel
typeinfo plugins.qmltypes