Revert "Positioners: allow distinguishing between implicit/explicit child size"

This reverts commit 2556bfdab42dc0aefb34bb7cf304063c7db0ff00.

This is no longer necessary, as there are now no users of this
functionality in other modules.

Change-Id: If92bbdb3e5e95b4103610d68d22e929cf30c4e5e
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>

1 files changed, 5 insertions, 28 deletions

diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index 8dc0d90a2f..9ae7029d69 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -132,11 +132,6 @@ public:
 
     static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj);
 
-    static QQuickBasePositionerPrivate* get(QQuickBasePositioner *positioner)
-    {
-        return positioner->d_func();
-    }
-
     void updateAttachedProperties(QQuickPositionerAttached *specificProperty = 0, QQuickItem *specificPropertyOwner = 0) const;
 
     qreal padding() const;
@@ -187,7 +182,7 @@ protected:
     virtual void doPositioning(QSizeF *contentSize)=0;
     virtual void reportConflictingAnchors()=0;
 
-    class Q_QUICK_PRIVATE_EXPORT PositionedItem
+    class PositionedItem
     {
     public :
         PositionedItem(QQuickItem *i);
@@ -232,7 +227,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickBasePositioner)
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickColumn : public QQuickBasePositioner
+class Q_AUTOTEST_EXPORT QQuickColumn : public QQuickBasePositioner
 {
     Q_OBJECT
 public:
@@ -246,7 +241,7 @@ private:
 };
 
 class QQuickRowPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickRow: public QQuickBasePositioner
+class Q_AUTOTEST_EXPORT QQuickRow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
@@ -271,7 +266,7 @@ private:
 };
 
 class QQuickGridPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickGrid : public QQuickBasePositioner
+class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
@@ -358,7 +353,7 @@ private:
 };
 
 class QQuickFlowPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickFlow: public QQuickBasePositioner
+class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
@@ -391,22 +386,6 @@ private:
     Q_DECLARE_PRIVATE(QQuickFlow)
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickImplicitRow : public QQuickRow
-{
-    Q_OBJECT
-
-public:
-    QQuickImplicitRow(QQuickItem *parent = nullptr);
-};
-
-class Q_QUICK_PRIVATE_EXPORT QQuickImplicitGrid : public QQuickGrid
-{
-    Q_OBJECT
-
-public:
-    QQuickImplicitGrid(QQuickItem *parent = nullptr);
-};
-
 
 QT_END_NAMESPACE
 
@@ -414,8 +393,6 @@ QML_DECLARE_TYPE(QQuickColumn)
 QML_DECLARE_TYPE(QQuickRow)
 QML_DECLARE_TYPE(QQuickGrid)
 QML_DECLARE_TYPE(QQuickFlow)
-QML_DECLARE_TYPE(QQuickImplicitRow)
-QML_DECLARE_TYPE(QQuickImplicitGrid)
 
 QML_DECLARE_TYPE(QQuickBasePositioner)
 QML_DECLARE_TYPEINFO(QQuickBasePositioner, QML_HAS_ATTACHED_PROPERTIES)