diff options
| author | abcd <qt-info@nokia.com> | 2011-06-16 18:02:52 +1000 |
|---|---|---|
| committer | abcd <qt-info@nokia.com> | 2011-06-16 18:02:52 +1000 |
| commit | 4ed6dadb8811cbfecdbbe621c90685cf961ebf99 (patch) | |
| tree | ec9e73ca92c2e4123c388229e75485d00985c96e /src/location/places/qplacecategory.h | |
| parent | c1afab9a1ec15eeaeb072be8eed9ba362f20b5e5 (diff) | |
merge in changes from qt4 pre-release
This covers changes from r45246 to r45259. Note not all changes
have been merged through. the qt4 pre-release doesn't support
connectivity modes, these have been retained for qt5.
Also the qt4 pre-release sends username for posting reviews this
hasn't been brought over to qt 5.
Diffstat (limited to 'src/location/places/qplacecategory.h')
| -rw-r--r-- | src/location/places/qplacecategory.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h index 15a8b307..93a8d508 100644 --- a/src/location/places/qplacecategory.h +++ b/src/location/places/qplacecategory.h @@ -31,8 +31,6 @@ public: void setAlternativeNames(const QList<QPlaceAlternativeValue> &names); QString categoryId() const; void setCategoryId(const QString &catID); - QString categorySystemId() const; - void setCategorySystemId(const QString &catID); QString description() const; void setDescription(const QString &description); QString name() const; |