diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-01-15 18:37:02 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-01-18 15:10:45 +0000 |
| commit | 60a8ef724c11c35413d42ef1ccd118e9c4f6c3c9 (patch) | |
| tree | 9181e29679d53c1cde1a07cdefe2dbcae40091e6 /src/app/app.pro | |
| parent | 5b999a1817e7829c87977b5d99f75a179ec36fda (diff) | |
Clean up the application after integration for b2qt
* put plugin.cpp into b2qt demo repository
* use resource file
* use AppEngine instead of WebEngine, WebEngine is already
registered with QtWebEgnine
* remove BrowserWindow class
* fix warnings and undefined errors in qml
* rename engine to appengine, qml name collision with launcherengine
Change-Id: I36b682a6a5e3c8f1453c9511c52561d0ff511e71
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/app/app.pro')
| -rw-r--r-- | src/app/app.pro | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/app/app.pro b/src/app/app.pro deleted file mode 100644 index 7b9b8a2..0000000 --- a/src/app/app.pro +++ /dev/null @@ -1,53 +0,0 @@ -TARGET = qtwebbrowser - -DESTDIR = ../ -CONFIG += c++11 -CONFIG -= app_bundle - -SOURCES = main.cpp \ - browserwindow.cpp \ - engine.cpp - -HEADERS = browserwindow.h \ - engine.h - -OTHER_FILES = \ - qml/assets/UIButton.qml \ - qml/assets/UIToolBar.qml \ - qml/ApplicationRoot.qml \ - qml/BrowserWindow.qml \ - qml/FeaturePermissionBar.qml \ - qml/MockTouchPoint.qml \ - qml/PageView.qml \ - qml/NavigationBar.qml \ - qml/HomeScreen.qml \ - qml/SettingsView.qml \ - -QT += qml quick webengine - -RESOURCES += resources.qrc - -!cross_compile { - DEFINES += HOST_BUILD - SOURCES += touchmockingapplication.cpp \ - navigationhistoryproxymodel.cpp \ - touchtracker.cpp - - HEADERS += touchmockingapplication.h \ - navigationhistoryproxymodel.h \ - touchtracker.h - - QT_PRIVATE += quick-private gui-private core-private -} -else { - DESTPATH = /data/user/qt/qtwebbrowser - - content.files = qml/* - content.path = $$DESTPATH - target.path = $$DESTPATH - - INSTALLS += target content -} - - - |