diff options
-rw-r--r-- | src/imports/systeminfo/qdeclarativedeviceprofile.cpp | 133 | ||||
-rw-r--r-- | src/imports/systeminfo/qdeclarativedeviceprofile_p.h | 99 | ||||
-rw-r--r-- | src/imports/systeminfo/qsysteminfo.cpp | 2 | ||||
-rw-r--r-- | src/imports/systeminfo/systeminfo.pro | 4 | ||||
-rw-r--r-- | src/systeminfo/qdeviceprofile.cpp | 166 | ||||
-rw-r--r-- | src/systeminfo/qdeviceprofile.h | 93 | ||||
-rw-r--r-- | src/systeminfo/simulator/qsysteminfodata_simulator.cpp | 23 | ||||
-rw-r--r-- | src/systeminfo/simulator/qsysteminfodata_simulator_p.h | 11 | ||||
-rw-r--r-- | src/systeminfo/systeminfo.pro | 7 |
9 files changed, 3 insertions, 535 deletions
diff --git a/src/imports/systeminfo/qdeclarativedeviceprofile.cpp b/src/imports/systeminfo/qdeclarativedeviceprofile.cpp deleted file mode 100644 index 92f7dfa2..00000000 --- a/src/imports/systeminfo/qdeclarativedeviceprofile.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtSystems module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdeclarativedeviceprofile_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \qmltype DeviceProfile - \instantiates QDeclarativeDeviceProfile - \inqmlmodule QtSystemInfo - \ingroup qml-systeminfo - \brief The DeviceProfile element provides information about the profile of the device. -*/ - -/*! - \internal -*/ -QDeclarativeDeviceProfile::QDeclarativeDeviceProfile(QObject *parent) - : QObject(parent) - , deviceProfile(new QDeviceProfile(this)) -{ -} - -/*! - \internal - */ -QDeclarativeDeviceProfile::~QDeclarativeDeviceProfile() -{ -} - -/*! - \qmlproperty bool DeviceProfile::isVibrationActivated - - This property holds whether the vibration is currently activated or deactivated. - */ - -bool QDeclarativeDeviceProfile::isVibrationActivated() const -{ - connect(deviceProfile, SIGNAL(vibrationActivatedChanged(bool)), - this, SIGNAL(vibrationActivatedChanged()), Qt::UniqueConnection); - return deviceProfile->isVibrationActivated(); -} - -/*! - \qmlproperty int DeviceProfile::messageRingtoneVolume - - This property holds the current message ringtone volume, from 0 to 100. - If this information is unknown, voice message volume requested but no result - received yet or error occurs, -1 is returned. - */ - -int QDeclarativeDeviceProfile::messageRingtoneVolume() const -{ - connect(deviceProfile, SIGNAL(messageRingtoneVolumeChanged(int)), - this, SIGNAL(messageRingtoneVolumeChanged()), Qt::UniqueConnection); - return deviceProfile->messageRingtoneVolume(); -} - -/*! - \qmlproperty int DeviceProfile::voiceRingtoneVolume - - This property holds the current voice ringtone volume, from 0 to 100. - If this information is unknown, voice ringtone volume requested but no result - received yet or error occurs, -1 is returned. - */ - -int QDeclarativeDeviceProfile::voiceRingtoneVolume() const -{ - connect(deviceProfile, SIGNAL(voiceRingtoneVolumeChanged(int)), - this, SIGNAL(voiceRingtoneVolumeChanged()), Qt::UniqueConnection); - return deviceProfile->voiceRingtoneVolume(); -} - -/*! - \qmlproperty enumeration DeviceProfile::currentProfileType - - Returns the type of the current profile, possible types are: - \list - \li DeviceProfile.UnknownProfile - Profile unknown, profile type requested but no result received yet or an error occured. - \li DeviceProfile.SilentProfile - Neither sound nor vibration is on. - \li DeviceProfile.NormalProfile - Normal sound is on. - \li DeviceProfile.VibrationProfile - Only vibration is on, and sound is off. - \li DeviceProfile.BeepProfile - Only beep is on. - \endlist - */ - -QDeclarativeDeviceProfile::ProfileType QDeclarativeDeviceProfile::currentProfileType() const -{ - connect(deviceProfile, SIGNAL(currentProfileTypeChanged(QDeviceProfile::ProfileType)), - this, SIGNAL(currentProfileTypeChanged()), Qt::UniqueConnection); - return static_cast<QDeclarativeDeviceProfile::ProfileType>(deviceProfile->currentProfileType()); -} - -QT_END_NAMESPACE diff --git a/src/imports/systeminfo/qdeclarativedeviceprofile_p.h b/src/imports/systeminfo/qdeclarativedeviceprofile_p.h deleted file mode 100644 index 34ac3e18..00000000 --- a/src/imports/systeminfo/qdeclarativedeviceprofile_p.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtSystems module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#ifndef QDECLARATIVEDEVICEPROFILE_P_H -#define QDECLARATIVEDEVICEPROFILE_P_H - -#include <qdeviceprofile.h> - -QT_BEGIN_NAMESPACE - -class QDeclarativeDeviceProfile : public QObject -{ - Q_OBJECT - - Q_ENUMS(ProfileType) - Q_PROPERTY(bool isVibrationActivated READ isVibrationActivated NOTIFY vibrationActivatedChanged) - Q_PROPERTY(int messageRingtoneVolume READ messageRingtoneVolume NOTIFY messageRingtoneVolumeChanged) - Q_PROPERTY(int voiceRingtoneVolume READ voiceRingtoneVolume NOTIFY voiceRingtoneVolumeChanged) - Q_PROPERTY(ProfileType currentProfileType READ currentProfileType NOTIFY currentProfileTypeChanged) - -public: - enum ProfileType { - UnknownProfile = QDeviceProfile::UnknownProfile, - SilentProfile = QDeviceProfile::SilentProfile, - NormalProfile = QDeviceProfile::NormalProfile, - VibrationProfile = QDeviceProfile::VibrationProfile, - BeepProfile = QDeviceProfile::BeepProfile - }; - - QDeclarativeDeviceProfile(QObject *parent = 0); - virtual ~QDeclarativeDeviceProfile(); - - bool isVibrationActivated() const; - int messageRingtoneVolume() const; - int voiceRingtoneVolume() const; - ProfileType currentProfileType() const; - -Q_SIGNALS: - void vibrationActivatedChanged(); - void messageRingtoneVolumeChanged(); - void voiceRingtoneVolumeChanged(); - void currentProfileTypeChanged(); - -private: - QDeviceProfile *deviceProfile; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVEDEVICEPROFILE_P_H diff --git a/src/imports/systeminfo/qsysteminfo.cpp b/src/imports/systeminfo/qsysteminfo.cpp index 072902d1..1e70ece3 100644 --- a/src/imports/systeminfo/qsysteminfo.cpp +++ b/src/imports/systeminfo/qsysteminfo.cpp @@ -44,7 +44,6 @@ #include "qdeclarativebatteryinfo_p.h" #include "qdeclarativedeviceinfo_p.h" -#include "qdeclarativedeviceprofile_p.h" #include "qdeclarativenetworkinfo_p.h" #include <qscreensaver.h> #include "qdeclarativestorageinfo_p.h" @@ -65,7 +64,6 @@ public: int minor = 0; qmlRegisterType<QDeclarativeBatteryInfo>(uri, major, minor, "BatteryInfo"); qmlRegisterType<QDeclarativeDeviceInfo>(uri, major, minor, "DeviceInfo"); - qmlRegisterType<QDeclarativeDeviceProfile>(uri, major, minor, "DeviceProfile"); qmlRegisterType<QDeclarativeNetworkInfo>(uri, major, minor, "NetworkInfo"); qmlRegisterType<QScreenSaver>(uri, major, minor, "ScreenSaver"); qmlRegisterType<QDeclarativeStorageInfo>(uri, major, minor, "StorageInfo"); diff --git a/src/imports/systeminfo/systeminfo.pro b/src/imports/systeminfo/systeminfo.pro index e2d9a535..4de880d5 100644 --- a/src/imports/systeminfo/systeminfo.pro +++ b/src/imports/systeminfo/systeminfo.pro @@ -5,15 +5,13 @@ HEADERS += \ qdeclarativebatteryinfo_p.h \ qdeclarativedeviceinfo_p.h \ qdeclarativenetworkinfo_p.h \ - qdeclarativestorageinfo_p.h \ - qdeclarativedeviceprofile_p.h + qdeclarativestorageinfo_p.h SOURCES += \ qdeclarativebatteryinfo.cpp \ qdeclarativedeviceinfo.cpp \ qdeclarativenetworkinfo.cpp \ qdeclarativestorageinfo.cpp \ - qdeclarativedeviceprofile.cpp \ qsysteminfo.cpp load(qml_plugin) diff --git a/src/systeminfo/qdeviceprofile.cpp b/src/systeminfo/qdeviceprofile.cpp deleted file mode 100644 index f96d8709..00000000 --- a/src/systeminfo/qdeviceprofile.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtSystems module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qdeviceprofile.h> - -QT_BEGIN_NAMESPACE -class QDeviceProfilePrivate -{ -public: - QDeviceProfilePrivate(QDeviceProfile *) {} - - bool isVibrationActivated() { return false; } - int messageRingtoneVolume() { return -1; } - int voiceRingtoneVolume() { return -1; } - QDeviceProfile::ProfileType currentProfileType() { return QDeviceProfile::UnknownProfile; } -}; -QT_END_NAMESPACE - -#include <QtCore/qmetaobject.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QDeviceProfile - \inmodule QtSystemInfo - \brief The QDeviceProfile class provides details for the profile of the device. - \ingroup systeminfo -*/ - -/*! - \enum QDeviceProfile::ProfileType - This enum describes the type of the current profile. - - \value UnknownProfile Profile unknown, profile type requested but no result received yet or an error occured. - \value SilentProfile Neither sound nor vibration is on. - \value NormalProfile Normal sound is on. - \value VibrationProfile Only vibration is on, and sound is off. - \value BeepProfile Only beep is on. -*/ - -/*! - \fn void QDeviceProfile::vibrationActivatedChanged(bool activated) - - This signal is emitted whenever vibration has been changed to \a activated. - */ - -/*! - \fn void QDeviceProfile::messageRingtoneVolumeChanged(int volume) - - This signal is emitted whenever the message ringtone volume has been changed to \a volume. - */ - -/*! - \fn void QDeviceProfile::voiceRingtoneVolumeChanged(int volume) - - This signal is emitted whenever the voice ringtone volume has been changed to \a volume. - */ - -/*! - \fn void QDeviceProfile::currentProfileTypeChanged(ProfileType profile) - - This signal is emitted whenever the current profile type has been changed to \a profile. - */ - -/*! - Constructs a QDeviceProfile object with the given \a parent. -*/ -QDeviceProfile::QDeviceProfile(QObject *parent) - : QObject(parent) - , d_ptr(new QDeviceProfilePrivate(this)) -{ -} - -/*! - Destroys the object -*/ -QDeviceProfile::~QDeviceProfile() -{ - delete d_ptr; -} - -/*! - \property QDeviceProfile::isVibrationActivated - \brief Vibration activated or deactivated. - - Returns whether the vibration is active for this profile. -*/ -bool QDeviceProfile::isVibrationActivated() const -{ - return d_ptr->isVibrationActivated(); -} - -/*! - \property QDeviceProfile::messageRingtoneVolume - \brief The message ringtone volume. - - Returns the message ringtone volume for this profile, from 0 to 100. If this information is unknown, - message volume requested but no result received yet or error occurs the -1 is returned. -*/ -int QDeviceProfile::messageRingtoneVolume() const -{ - return d_ptr->messageRingtoneVolume(); -} - -/*! - \property QDeviceProfile::voiceRingtoneVolume - \brief The voice ringtone volume. - - Returns the voice ringtone volume for this profile, from 0 to 100. If this information is unknown, - voice volume requested but no result received yet or error occurs the -1 is returned. -*/ -int QDeviceProfile::voiceRingtoneVolume() const -{ - return d_ptr->voiceRingtoneVolume(); -} - -/*! - \property QDeviceProfile::currentProfileType - \brief The current activated profile. - - Returns the type for this profile. -*/ -QDeviceProfile::ProfileType QDeviceProfile::currentProfileType() const -{ - return d_ptr->currentProfileType(); -} - -QT_END_NAMESPACE diff --git a/src/systeminfo/qdeviceprofile.h b/src/systeminfo/qdeviceprofile.h deleted file mode 100644 index fcc90b9a..00000000 --- a/src/systeminfo/qdeviceprofile.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtSystems module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDEVICEPROFILE_H -#define QDEVICEPROFILE_H - -#include <QtSystemInfo/qsysteminfoglobal.h> -#include <QtCore/qobject.h> - -QT_BEGIN_NAMESPACE - -class QDeviceProfilePrivate; - -class Q_SYSTEMINFO_EXPORT QDeviceProfile : public QObject -{ - Q_OBJECT - - Q_ENUMS(ProfileType) - Q_PROPERTY(bool isVibrationActivated READ isVibrationActivated NOTIFY vibrationActivatedChanged) - Q_PROPERTY(int messageRingtoneVolume READ messageRingtoneVolume NOTIFY messageRingtoneVolumeChanged) - Q_PROPERTY(int voiceRingtoneVolume READ voiceRingtoneVolume NOTIFY voiceRingtoneVolumeChanged) - Q_PROPERTY(ProfileType currentProfileType READ currentProfileType NOTIFY currentProfileTypeChanged) - -public: - enum ProfileType { - UnknownProfile = 0, - SilentProfile, - NormalProfile, - VibrationProfile, - BeepProfile - }; - - QDeviceProfile(QObject *parent = 0); - virtual ~QDeviceProfile(); - - bool isVibrationActivated() const; - int messageRingtoneVolume() const; - int voiceRingtoneVolume() const; - ProfileType currentProfileType() const; - -Q_SIGNALS: - void vibrationActivatedChanged(bool activated); - void messageRingtoneVolumeChanged(int volume); - void voiceRingtoneVolumeChanged(int volume); - void currentProfileTypeChanged(QDeviceProfile::ProfileType profile); - -private: - Q_DISABLE_COPY(QDeviceProfile) - QDeviceProfilePrivate * const d_ptr; - Q_DECLARE_PRIVATE(QDeviceProfile) -}; - -QT_END_NAMESPACE - -#endif // QDEVICEPROFILE_H diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp index 7cebd4dd..75e12b32 100644 --- a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp +++ b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp @@ -57,7 +57,6 @@ void qt_registerSystemInfoTypes() qRegisterMetaTypeStreamOperators<QStorageInfoData>("QStorageInfoData"); qRegisterMetaTypeStreamOperators<QStorageInfoData::DriveInfo>("QStorageInfoData::DriveInfo"); qRegisterMetaTypeStreamOperators<QScreenSaverData>("QScreenSaverData"); - qRegisterMetaTypeStreamOperators<QDeviceProfileData>("QDeviceProfileData"); } QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BasicNetworkInfo &s) @@ -303,28 +302,6 @@ QDataStream &operator>>(QDataStream &in, QScreenSaverData &s) return in; } -QDataStream &operator<<(QDataStream &out, const QDeviceProfileData &s) -{ - out << static_cast<qint32>(s.messageRingtoneVolume) - << static_cast<qint32>(s.voiceRingtoneVolume) - << static_cast<qint32>(s.profileType); - out << s.isVibrationActivated; - - return out; -} - -QDataStream &operator>>(QDataStream &in, QDeviceProfileData &s) -{ - qint32 messageRingtoneVolume, voiceRingtoneVolume, profileType; - in >> messageRingtoneVolume >> voiceRingtoneVolume >> profileType; - s.messageRingtoneVolume = messageRingtoneVolume; - s.voiceRingtoneVolume = voiceRingtoneVolume; - s.profileType = static_cast<QDeviceProfile::ProfileType>(profileType); - in >> s.isVibrationActivated; - - return in; -} - QT_END_NAMESPACE diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h index f624de1e..15e26595 100644 --- a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h +++ b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h @@ -59,7 +59,6 @@ #include <qbatteryinfo.h> #include <qstorageinfo.h> #include <qscreensaver.h> -#include <qdeviceprofile.h> #include <QHash> #include <QVector> @@ -161,20 +160,12 @@ struct QScreenSaverData bool screenSaverEnabled; }; -struct QDeviceProfileData -{ - int messageRingtoneVolume; - int voiceRingtoneVolume; - QDeviceProfile::ProfileType profileType; - bool isVibrationActivated; -}; Q_DECLARE_METATYPE(QNetworkInfoData) Q_DECLARE_METATYPE(QDeviceInfoData) Q_DECLARE_METATYPE(QBatteryInfoData) Q_DECLARE_METATYPE(QStorageInfoData) Q_DECLARE_METATYPE(QScreenSaverData) -Q_DECLARE_METATYPE(QDeviceProfileData) void qt_registerSystemInfoTypes(); @@ -204,8 +195,6 @@ QDataStream &operator<<(QDataStream &out, const QStorageInfoData::DriveInfo &s); QDataStream &operator>>(QDataStream &in, QStorageInfoData::DriveInfo &s); QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s); QDataStream &operator>>(QDataStream &in, QScreenSaverData &s); -QDataStream &operator<<(QDataStream &out, const QDeviceProfileData &s); -QDataStream &operator>>(QDataStream &in, QDeviceProfileData &s); QT_END_NAMESPACE diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index fc8d44be..93154dae 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -7,15 +7,13 @@ PUBLIC_HEADERS = qsysteminfoglobal.h \ qstorageinfo.h \ qscreensaver.h \ qbatteryinfo.h \ - qnetworkinfo.h \ - qdeviceprofile.h + qnetworkinfo.h SOURCES += qdeviceinfo.cpp \ qstorageinfo.cpp \ qscreensaver.cpp \ qbatteryinfo.cpp \ - qnetworkinfo.cpp \ - qdeviceprofile.cpp + qnetworkinfo.cpp win32: !simulator: { contains(CONFIG, release) { @@ -176,7 +174,6 @@ simulator { linux-*: { PRIVATE_HEADERS += \ linux/qscreensaver_linux_p.h \ - linux/qdeviceprofile_linux_p.h \ linux/qstorageinfo_linux_p.h SOURCES += \ |