summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-04-15 14:58:26 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-04-15 14:58:26 (GMT)
commit85f809b743e42ef4595c1f14c6b1266774840eac (patch)
tree9555342ac62b0f51639cf939673897fdf1aa973a
parent664408e1046a4d412662b00f5791a9a2b19fde64 (diff)
parenta273359edf9308b336d1c04f1b06185dc0bc8bdd (diff)
downloadQt-85f809b743e42ef4595c1f14c6b1266774840eac.zip
Qt-85f809b743e42ef4595c1f14c6b1266774840eac.tar.gz
Qt-85f809b743e42ef4595c1f14c6b1266774840eac.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
-rw-r--r--examples/webkit/simplewebplugin/simplewebplugin.qrc6
-rw-r--r--examples/webkit/webplugin/webplugin.qrc6
2 files changed, 12 insertions, 0 deletions
diff --git a/examples/webkit/simplewebplugin/simplewebplugin.qrc b/examples/webkit/simplewebplugin/simplewebplugin.qrc
new file mode 100644
index 0000000..14f80e7
--- /dev/null
+++ b/examples/webkit/simplewebplugin/simplewebplugin.qrc
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/" >
+ <file>pages/index.html</file>
+ <file>data/accounts.csv</file>
+ </qresource>
+</RCC>
diff --git a/examples/webkit/webplugin/webplugin.qrc b/examples/webkit/webplugin/webplugin.qrc
new file mode 100644
index 0000000..14f80e7
--- /dev/null
+++ b/examples/webkit/webplugin/webplugin.qrc
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/" >
+ <file>pages/index.html</file>
+ <file>data/accounts.csv</file>
+ </qresource>
+</RCC>