Merge changes from qt4 pre-release

This is equivalent to changes from r45158 to r45244

1 files changed, 4 insertions, 4 deletions

diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index 2e4e9e29..95d37067 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -62,16 +62,16 @@ public:
     void setFeeds(const QStringList &feeds);
     QPlacePaginationList<QPlaceMediaObject> media() const;
     void setMedia(const QPlacePaginationList<QPlaceMediaObject> &media);
-    uint mediaCount() const;
-    void setMediaCount(const uint &data);
+    int mediaCount() const;
+    void setMediaCount(const int &count);
     QString name() const;
     void setName(const QString &name);
     QString placeId() const;
     void setPlaceId(const QString &placeId);
     QPlacePaginationList<QPlaceReview> reviews() const;
     void setReviews(const QPlacePaginationList<QPlaceReview> &reviews);
-    uint reviewCount() const;
-    void setReviewCount(const uint &data);
+    int reviewCount() const;
+    void setReviewCount(const int &count);
     QString shortDescription() const;
     void setShortDescription(const QString &description);
     QStringList tags() const;