diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 16:24:22 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 16:24:46 +0300 |
commit | 7437efd149c29b8c8ca6acfaf3a5787b2a8f8522 (patch) | |
tree | f54f4ab8c9cadc2142f2194f69a64e46541da23b /basicsuite/qtwebbrowser | |
parent | 7767cd8291afdb78bc91bed706fc94899057510c (diff) | |
parent | 1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
* origin/5.6:
Doc: Language fixes for the demo descriptions
Exclude planets demo on emulator
democompositor: make demo deployable
New icons
qtwebbrowser: add pro file to create stand-alone application
Remove android from exclude list
Exclude canvas3d planets demo from RPi2
Change-Id: Ia84a23bb9daf45d239e4e65e342083fe410303ae
Diffstat (limited to 'basicsuite/qtwebbrowser')
-rw-r--r-- | basicsuite/qtwebbrowser/app.pro | 13 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/lib.pro | 29 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/main.qml | 3 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/qtwebbrowser.pro | 31 |
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 |