diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2013-01-22 10:15:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 10:45:03 +0100 |
| commit | caaff1211d85d2f8e85dbc9c9e2fd42acbef3ac0 (patch) | |
| tree | a699a6974ce47445177ce254aa7dd7331001508a /src/systeminfo/qdeviceinfo.h | |
| parent | 2dbaae64ccd0fa3646d68d77cbc9baac7d3bde2e (diff) | |
Do not use interface as variable or parameter name
As "interface" is defined as struct in objbase.h on windows it either
should not be used as a variable or parameter name or undefed before.
(see CI failure in https://codereview.qt-project.org/#change,45321 )
As parts of QtSystems rely on other windows headers which need interface
defined as struct it cannot be 'undef'ed "globally". Thus "interface" is
replaced with proper values in files where it occurs.
Change-Id: I9f77df966c7243fbc06aea87be075bfbd9b05d4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Cristiano di Flora <cristiano.diflora@gmail.com>
Diffstat (limited to 'src/systeminfo/qdeviceinfo.h')
| -rw-r--r-- | src/systeminfo/qdeviceinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systeminfo/qdeviceinfo.h b/src/systeminfo/qdeviceinfo.h index 07d64763..937272ed 100644 --- a/src/systeminfo/qdeviceinfo.h +++ b/src/systeminfo/qdeviceinfo.h @@ -118,7 +118,7 @@ public: Q_INVOKABLE bool hasFeature(QDeviceInfo::Feature feature) const; Q_INVOKABLE int imeiCount() const; - Q_INVOKABLE QString imei(int interface) const; + Q_INVOKABLE QString imei(int interfaceNumber) const; Q_INVOKABLE QString manufacturer() const; Q_INVOKABLE QString model() const; Q_INVOKABLE QString productName() const; |