4 files changed, 48 insertions, 28 deletions
diff --git a/basicsuite/qtwebbrowser/app.pro b/basicsuite/qtwebbrowser/app.pro
new file mode 100644
index 0000000..eda1be9
--- /dev/null
+++ b/basicsuite/qtwebbrowser/app.pro
@@ -0,0 +1,13 @@
+TARGET = qtwebbrowser
+
+include(../shared/shared.pri)
+b2qtdemo_deploy_defaults()
+
+content.files = \
+    *.qml \
+    *.png
+content.path = $$DESTPATH
+
+OTHER_FILES += $${content.files}
+
+INSTALLS += target content
diff --git a/basicsuite/qtwebbrowser/lib.pro b/basicsuite/qtwebbrowser/lib.pro
new file mode 100644
index 0000000..16152f2
--- /dev/null
+++ b/basicsuite/qtwebbrowser/lib.pro
@@ -0,0 +1,29 @@
+TEMPLATE = lib
+TARGET = webbrowser
+QT += qml quick
+CONFIG += qt plugin
+
+INCLUDEPATH += tqtc-qtwebbrowser/src
+
+HEADERS += \
+    tqtc-qtwebbrowser/src/appengine.h \
+    tqtc-qtwebbrowser/src/touchtracker.h \
+    tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h
+
+SOURCES += \
+    plugin.cpp \
+    tqtc-qtwebbrowser/src/appengine.cpp \
+    tqtc-qtwebbrowser/src/touchtracker.cpp \
+    tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp
+
+pluginfiles.files += \
+    qmldir
+
+RESOURCES += tqtc-qtwebbrowser/src/resources.qrc
+
+B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser
+
+target.path = $$B2QT_DEPLOYPATH
+pluginfiles.path = $$B2QT_DEPLOYPATH
+
+INSTALLS += target pluginfiles
diff --git a/basicsuite/qtwebbrowser/main.qml b/basicsuite/qtwebbrowser/main.qml
index dcca154..c0f795c 100644
--- a/basicsuite/qtwebbrowser/main.qml
+++ b/basicsuite/qtwebbrowser/main.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.0
+import WebBrowser 1.0
 
 Loader {
-    source: "tqtc-qtwebbrowser/src/qml/BrowserWindow.qml"
+    source: "qrc:/qml/BrowserWindow.qml"
 }
diff --git a/basicsuite/qtwebbrowser/qtwebbrowser.pro b/basicsuite/qtwebbrowser/qtwebbrowser.pro
index 8532344..dc2f809 100644
--- a/basicsuite/qtwebbrowser/qtwebbrowser.pro
+++ b/basicsuite/qtwebbrowser/qtwebbrowser.pro
@@ -1,27 +1,4 @@
-TEMPLATE = lib
-TARGET = webbrowser
-QT += qml quick
-CONFIG += qt plugin
-
-INCLUDEPATH += tqtc-qtwebbrowser/src
-
-HEADERS += \
-    tqtc-qtwebbrowser/src/appengine.h \
-    tqtc-qtwebbrowser/src/touchtracker.h \
-    tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h
-
-SOURCES += \
-    plugin.cpp \
-    tqtc-qtwebbrowser/src/appengine.cpp \
-    tqtc-qtwebbrowser/src/touchtracker.cpp \
-    tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp
-
-pluginfiles.files += \
-    qmldir
-
-B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser
-
-target.path = $$B2QT_DEPLOYPATH
-pluginfiles.path = $$B2QT_DEPLOYPATH
-
-INSTALLS += target pluginfiles
+TEMPLATE = subdirs
+SUBDIRS += \
+    lib.pro \
+    app.pro