Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Packaging] Remove Qt4 support. MER#1963 See merge request mer-core/libqofono!13
- Loading branch information
Showing
14 changed files
with
44 additions
and
527 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,12 @@ | ||
#include <QApplication> | ||
#include "qmlapplicationviewer.h" | ||
#include <QGuiApplication> | ||
#include <QQmlApplicationEngine> | ||
|
||
Q_DECL_EXPORT int main(int argc, char *argv[]) | ||
{ | ||
QScopedPointer<QApplication> app(createApplication(argc, argv)); | ||
QGuiApplication app(argc, argv); | ||
|
||
QmlApplicationViewer viewer; | ||
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); | ||
viewer.setMainQmlFile(QLatin1String("qml/ofonotest/main.qml")); | ||
viewer.showExpanded(); | ||
QQmlApplicationEngine engine; | ||
engine.load(QUrl(QLatin1String("/opt/examples/libqofono-qt5/qml/ofonotest/main.qml"))); | ||
|
||
return app->exec(); | ||
return app.exec(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,11 @@ | ||
# Add more folders to ship with the application, here | ||
folder_01.source = qml/ofonotest | ||
folder_01.target = qml | ||
DEPLOYMENTFOLDERS = folder_01 | ||
TEMPLATE = app | ||
QT += qml quick | ||
|
||
# Additional import path used to resolve QML modules in Creator's code model | ||
QML_IMPORT_PATH = | ||
|
||
# If your application uses the Qt Mobility libraries, uncomment the following | ||
# lines and add the respective components to the MOBILITY variable. | ||
# CONFIG += mobility | ||
# MOBILITY += | ||
|
||
# Speed up launching on MeeGo/Harmattan when using applauncherd daemon | ||
CONFIG += qdeclarative-boostable | ||
|
||
# The .cpp file which was generated for your project. Feel free to hack it. | ||
SOURCES += main.cpp | ||
|
||
# Please do not modify the following two lines. Required for deployment. | ||
include(qmlapplicationviewer/qmlapplicationviewer.pri) | ||
qtcAddDeployment() | ||
qml.files += \ | ||
qml/ofonotest/main.qml | ||
qml.path = /opt/examples/libqofono-qt5/qml/ofonotest/main.qml | ||
|
||
target.path = /opt/examples/libqofono-qt5/ | ||
INSTALLS += target qml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import QtQuick 1.1 | ||
import QtQuick 2.0 | ||
import MeeGo.QOfono 0.2 | ||
|
||
|
||
|
177 changes: 0 additions & 177 deletions
177
ofonotest/qmlapplicationviewer/qmlapplicationviewer.cpp
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.