1 files changed, 42 insertions, 17 deletions

diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h
index c938cedccc..dd55fdc7a6 100644
--- a/src/particles/qquickparticleemitter_p.h
+++ b/src/particles/qquickparticleemitter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -113,6 +119,13 @@ public:
         return m_group;
     }
 
+    QQuickParticleGroupData::ID groupId() const
+    {
+        if (m_groupIdNeedRecalculation)
+            reclaculateGroupId();
+        return m_groupId;
+    }
+
     int particleDurationVariation() const
     {
         return m_particleDurationVariation;
@@ -179,6 +192,7 @@ public Q_SLOTS:
     {
         if (m_system != arg) {
             m_system = arg;
+            m_groupIdNeedRecalculation = true;
             if (m_system)
                 m_system->registerParticleEmitter(this);
             Q_EMIT systemChanged(arg);
@@ -189,6 +203,7 @@ public Q_SLOTS:
     {
         if (m_group != arg) {
             m_group = arg;
+            m_groupIdNeedRecalculation = true;
             Q_EMIT groupChanged(arg);
         }
     }
@@ -260,7 +275,12 @@ public Q_SLOTS:
 
        virtual void reset();
 public:
-       int particleCount() const;
+       int particleCount() const
+       {
+           if (m_maxParticleCount >= 0)
+               return m_maxParticleCount;
+           return m_particlesPerSecond*((m_particleDuration+m_particleDurationVariation)/1000.0);
+       }
 
        QQuickParticleExtruder* extruder() const
        {
@@ -302,13 +322,14 @@ public:
            return m_startTime;
        }
 
+       void reclaculateGroupId() const;
+
 protected:
        qreal m_particlesPerSecond;
        int m_particleDuration;
        int m_particleDurationVariation;
        bool m_enabled;
        QQuickParticleSystem* m_system;
-       QString m_group;
        QQuickParticleExtruder* m_extruder;
        QQuickParticleExtruder* m_defaultExtruder;
        QQuickParticleExtruder* effectiveExtruder();
@@ -339,7 +360,11 @@ protected:
        QPointF m_last_last_last_emitter;
 
        bool isEmitConnected();
-private:
+
+private: // data
+       QString m_group;
+       mutable bool m_groupIdNeedRecalculation;
+       mutable QQuickParticleGroupData::ID m_groupId;
        QQuickDirection m_nullVector;
 
 };