Skip to content

Commit

Permalink
[Packaging] Remove Qt4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
neochapay committed Apr 19, 2019
1 parent 7239484 commit 37bb0af
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 527 deletions.
22 changes: 5 additions & 17 deletions libqofono.pro
Expand Up @@ -2,21 +2,9 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += src \
plugin \
test
test \
ofonotest

equals(QT_MAJOR_VERSION, 4):{
SUBDIRS += ofonotest
}


equals(QT_MAJOR_VERSION, 4): {
OTHER_FILES += rpm/libqofono.spec \
rpm/libqofono.yaml
}

equals(QT_MAJOR_VERSION, 5): {
OTHER_FILES += rpm/libqofono-qt5.spec \
rpm/libqofono-qt5.yaml \
TODO \
README
}
OTHER_FILES += rpm/libqofono-qt5.spec \
TODO \
README
14 changes: 6 additions & 8 deletions ofonotest/main.cpp
@@ -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();
}
27 changes: 8 additions & 19 deletions ofonotest/ofonotest.pro
@@ -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
2 changes: 1 addition & 1 deletion ofonotest/qml/ofonotest/main.qml
@@ -1,4 +1,4 @@
import QtQuick 1.1
import QtQuick 2.0
import MeeGo.QOfono 0.2


Expand Down
177 changes: 0 additions & 177 deletions ofonotest/qmlapplicationviewer/qmlapplicationviewer.cpp

This file was deleted.

46 changes: 0 additions & 46 deletions ofonotest/qmlapplicationviewer/qmlapplicationviewer.h

This file was deleted.

0 comments on commit 37bb0af

Please sign in to comment.