diff options
Diffstat (limited to 'src/connectivity')
4 files changed, 35 insertions, 35 deletions
diff --git a/src/connectivity/connectivity/connectivity.pro b/src/connectivity/connectivity/connectivity.pro index fd4d607f..901dbf9d 100644 --- a/src/connectivity/connectivity/connectivity.pro +++ b/src/connectivity/connectivity/connectivity.pro @@ -1,12 +1,12 @@ TARGET = $$qtLibraryTarget(Connectivity) TEMPLATE = lib -CONFIG += ivigenerator +CONFIG += ifcodegen -QT += ivicore ivicore-private qml quick -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly") +QT += interfaceframework interfaceframework-private qml quick +QT_FOR_CONFIG += interfaceframework +!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly") -QFACE_SOURCES = ../connectivity.qface +IFCODEGEN_SOURCES = ../connectivity.qface DESTDIR = $$LIB_DESTDIR DEFINES += QT_BUILD_CONNECTIVITY_LIB diff --git a/src/connectivity/connectivity_plugin/connectivity_plugin.pro b/src/connectivity/connectivity_plugin/connectivity_plugin.pro index c2fc9d1b..189d2605 100644 --- a/src/connectivity/connectivity_plugin/connectivity_plugin.pro +++ b/src/connectivity/connectivity_plugin/connectivity_plugin.pro @@ -1,19 +1,19 @@ TEMPLATE = lib CONFIG += plugin -QT += ivicore qml +QT += interfaceframework qml LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(Connectivity) INCLUDEPATH += $$OUT_PWD/../connectivity -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly") +QT_FOR_CONFIG += interfaceframework +!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly") include($$SOURCE_DIR/config.pri) -QFACE_FORMAT = qmlplugin -QFACE_SOURCES = ../connectivity.qface +IFCODEGEN_TEMPLATE = qmlplugin +IFCODEGEN_SOURCES = ../connectivity.qface -load(ivigenerator) +load(ifcodegen) uri = Connectivity EXTRA_FILES += $$OUT_PWD/qmldir \ diff --git a/src/connectivity/wifi_simulation/simulation.qml b/src/connectivity/wifi_simulation/simulation.qml index 39f1da75..afd4152f 100644 --- a/src/connectivity/wifi_simulation/simulation.qml +++ b/src/connectivity/wifi_simulation/simulation.qml @@ -35,10 +35,10 @@ import shared.Connectivity.simulation 1.0 Item { WiFiBackend { id: backend - property var settings : IviSimulator.findData(IviSimulator.simulationData, "WiFi") + property var settings : IfSimulator.findData(IfSimulator.simulationData, "WiFi") function initialize() { - IviSimulator.initializeDefault(settings, backend) + IfSimulator.initializeDefault(settings, backend) Base.initialize() for (var i = 0; i < 7; i++) { @@ -127,7 +127,7 @@ Item { } } - function connectToAccessPoint(qtIviReply, ssid) { + function connectToAccessPoint(qtIfReply, ssid) { for (var j = 0; j < backend.allAccessPoints.length; j++) { if (backend.accessPoints[j].ssid == ssid) { var security = backend.allAccessPoints[j].security @@ -143,12 +143,12 @@ Item { } } - qtIviReply.setSuccess(0) - return qtIviReply + qtIfReply.setSuccess(0) + return qtIfReply } - function sendCredentials(qtIviReply, ssid, password) { + function sendCredentials(qtIfReply, ssid, password) { var success = false; for (var j = 0; j < backend.allAccessPoints.length; j++) { if ( backend.activeAccessPoint.ssid == backend.allAccessPoints[j].ssid ) { @@ -160,24 +160,24 @@ Item { } if (success) { - qtIviReply.setSuccess(0) + qtIfReply.setSuccess(0) } else { - qtIviReply.setFailed() + qtIfReply.setFailed() } - return qtIviReply + return qtIfReply } - function disconnectFromAccessPoint(qtIviReply, ssid) { + function disconnectFromAccessPoint(qtIfReply, ssid) { backend.connectionStatus = WiFi.Disconnecting timerDisconnecting.start() - qtIviReply.setSuccess(0) - return qtIviReply + qtIfReply.setSuccess(0) + return qtIfReply } readonly property Connections backendSignals: Connections { target: backend - onEnabledChanged: { - if (!backend.enabled) { + function onEnabledChanged(enabled) { + if (!enabled) { for (var j = 0; j < backend.allAccessPoints.length; j++) { backend.allAccessPoints[j].connected = false } diff --git a/src/connectivity/wifi_simulation/wifi_simulation.pro b/src/connectivity/wifi_simulation/wifi_simulation.pro index 5546c090..231916d7 100644 --- a/src/connectivity/wifi_simulation/wifi_simulation.pro +++ b/src/connectivity/wifi_simulation/wifi_simulation.pro @@ -1,28 +1,28 @@ TEMPLATE = lib TARGET = $$qtLibraryTarget(wifi_simulation) -CONFIG += ivigenerator plugin +CONFIG += ifcodegen plugin -QT += core ivicore -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly") +QT += core interfaceframework +QT_FOR_CONFIG += interfaceframework +!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly") LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(Connectivity) -DESTDIR = $$BUILD_DIR/qtivi +DESTDIR = $$BUILD_DIR/interfaceframework include($$SOURCE_DIR/config.pri) -QFACE_FORMAT = backend_simulator -QFACE_SOURCES = ../connectivity.qface -PLUGIN_TYPE = qtivi +IFCODEGEN_TEMPLATE = backend_simulator +IFCODEGEN_SOURCES = ../connectivity.qface +PLUGIN_TYPE = interfaceframework INCLUDEPATH += $$OUT_PWD/../connectivity # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = $$OUT_PWD/../connectivity/qml -QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi) +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework) -target.path = $$INSTALL_PREFIX/neptune3/qtivi +target.path = $$INSTALL_PREFIX/neptune3/interfaceframework INSTALLS += target RESOURCES += plugin_resource.qrc |