diff options
| author | Travis Allen <tallen@blackberry.com> | 2013-11-20 13:37:01 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-25 09:43:34 +0100 |
| commit | 15d5f783c972b8a9fff72a1f5ea4fc956554e3f6 (patch) | |
| tree | deb8fb725a96b85069aa8db1d362a9388dc79cf1 /src/imports | |
| parent | 64e7d7076b61eb3781b9dee73b56b5559025f37c (diff) | |
First steps towards QBatteryInfo Refactorization
-Remove the QML wrapper registration temporarily
-Change the public API to lock it to one index
-Change the Linux private API to lock it to one index
-Change the Mac private API to lock it to one index
-Change the Windows private API to lock it to one index
-Change the tests to use the new API
-Change the Simulator private API to lock it to one index
Change-Id: I5b3d36a3baad339623281d79014c411c59dd1b59
Reviewed-by: Andrew Wooster <awooster@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/systeminfo/qsysteminfo.cpp | 2 | ||||
| -rw-r--r-- | src/imports/systeminfo/systeminfo.pro | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/systeminfo/qsysteminfo.cpp b/src/imports/systeminfo/qsysteminfo.cpp index 1e70ece3..c3fb9bbd 100644 --- a/src/imports/systeminfo/qsysteminfo.cpp +++ b/src/imports/systeminfo/qsysteminfo.cpp @@ -42,7 +42,6 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include "qdeclarativebatteryinfo_p.h" #include "qdeclarativedeviceinfo_p.h" #include "qdeclarativenetworkinfo_p.h" #include <qscreensaver.h> @@ -62,7 +61,6 @@ public: int major = 5; int minor = 0; - qmlRegisterType<QDeclarativeBatteryInfo>(uri, major, minor, "BatteryInfo"); qmlRegisterType<QDeclarativeDeviceInfo>(uri, major, minor, "DeviceInfo"); qmlRegisterType<QDeclarativeNetworkInfo>(uri, major, minor, "NetworkInfo"); qmlRegisterType<QScreenSaver>(uri, major, minor, "ScreenSaver"); diff --git a/src/imports/systeminfo/systeminfo.pro b/src/imports/systeminfo/systeminfo.pro index 4de880d5..a3ce2ae3 100644 --- a/src/imports/systeminfo/systeminfo.pro +++ b/src/imports/systeminfo/systeminfo.pro @@ -2,13 +2,11 @@ QT += qml systeminfo QT -= gui HEADERS += \ - qdeclarativebatteryinfo_p.h \ qdeclarativedeviceinfo_p.h \ qdeclarativenetworkinfo_p.h \ qdeclarativestorageinfo_p.h SOURCES += \ - qdeclarativebatteryinfo.cpp \ qdeclarativedeviceinfo.cpp \ qdeclarativenetworkinfo.cpp \ qdeclarativestorageinfo.cpp \ |