Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

2 files changed, 0 insertions, 4 deletions

diff --git a/src/imports/particles/dataparticle.h b/src/imports/particles/dataparticle.h
index e048450894..84422e70c3 100644
--- a/src/imports/particles/dataparticle.h
+++ b/src/imports/particles/dataparticle.h
@@ -89,8 +89,6 @@ signals:
 public slots:
     void freeze(QSGItem* item);
     void unfreeze(QSGItem* item);
-    void take(QSGItem* item,bool prioritize=false);//take by modelparticle
-    void give(QSGItem* item);//give from modelparticle
 
     void setFade(bool arg){if(arg == m_fade) return; m_fade = arg; emit fadeChanged();}
 protected:
diff --git a/src/imports/particles/itemparticle.h b/src/imports/particles/itemparticle.h
index 606a361584..40dab74622 100644
--- a/src/imports/particles/itemparticle.h
+++ b/src/imports/particles/itemparticle.h
@@ -82,8 +82,6 @@ public slots:
 protected:
     virtual void reset();
     void prepareNextFrame();
-private slots:
-    void updateCount();
 private:
     QList<QPointer<QSGItem> > m_deletables;
     int m_particleCount;