diff options
| author | Steffen Hahn <steffen.hahn@nokia.com> | 2012-06-05 16:50:37 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 10:20:00 +0200 |
| commit | 40a4d23f32e9e06869bc538c99e81dd8f18c391b (patch) | |
| tree | 8fa3c3e4d3a6015ccb132575a88b08d772fd3039 /src/imports | |
| parent | fa55ff98a8daa124c09b9d65dc052b07607fc72b (diff) | |
Continue support of monitorAllLogicalDrives property
This patch is to revert changes from https://codereview.qt-project.org/#change,18819.
There are use cases where developers wants to listen to onLogicalDrivesChanged signal
without reading the allLogicalDrives list at all. The idea was to enable monitoring
by default when reading allLogicalDrives property. To close this gap the monitor
property should be kept so that onLogicalDrivesChanged signal can be conveniently
enabled for all use-cases.
Change-Id: I67e2048de5bec25305e38172518e9a9de3873018
Reviewed-by: Yang Li <yang.12.li@nokia.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/systeminfo/qdeclarativestorageinfo.cpp | 4 | ||||
| -rw-r--r-- | src/imports/systeminfo/qdeclarativestorageinfo_p.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/imports/systeminfo/qdeclarativestorageinfo.cpp b/src/imports/systeminfo/qdeclarativestorageinfo.cpp index 398e926c..383109e5 100644 --- a/src/imports/systeminfo/qdeclarativestorageinfo.cpp +++ b/src/imports/systeminfo/qdeclarativestorageinfo.cpp @@ -70,7 +70,7 @@ QDeclarativeStorageInfo::~QDeclarativeStorageInfo() /*! \qmlproperty bool StorageInfo::monitorAllLogicalDrives - This property is obsoleted, and will be removed soon. You don't need to use it at all. + This property triggers the active monitoring of all available logical drives. */ bool QDeclarativeStorageInfo::monitorAllLogicalDrives() const { @@ -99,8 +99,6 @@ void QDeclarativeStorageInfo::setMonitorAllLogicalDrives(bool monitor) */ QStringList QDeclarativeStorageInfo::allLogicalDrives() const { - connect(storageInfo, SIGNAL(logicalDriveChanged(QString,bool)), - this, SIGNAL(logicalDriveChanged(QString,bool)), Qt::UniqueConnection); return storageInfo->allLogicalDrives(); } diff --git a/src/imports/systeminfo/qdeclarativestorageinfo_p.h b/src/imports/systeminfo/qdeclarativestorageinfo_p.h index eb93b662..9b62eb31 100644 --- a/src/imports/systeminfo/qdeclarativestorageinfo_p.h +++ b/src/imports/systeminfo/qdeclarativestorageinfo_p.h @@ -65,8 +65,6 @@ class QDeclarativeStorageInfo : public QObject Q_ENUMS(DriveType) Q_PROPERTY(QStringList allLogicalDrives READ allLogicalDrives NOTIFY logicalDriveChanged) - - // obsoleted Q_PROPERTY(bool monitorAllLogicalDrives READ monitorAllLogicalDrives WRITE setMonitorAllLogicalDrives NOTIFY monitorAllLogicalDrivesChanged) public: |