Merge remote-tracking branch 'origin/master' into refactor

Conflicts: src/declarative/declarative.pro Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
sailfishos · Aug 31, 2011 · 20c3575 · 20c3575
2 parents 7147835 + 3108a36
commit 20c3575
Show file tree

Hide file tree

Showing 33 changed files with 954 additions and 58 deletions.
diff --git a/examples/declarative/particles/asteroid/blackhole.qml b/examples/declarative/particles/asteroid/blackhole.qml
@@ -146,7 +146,7 @@ Rectangle{
         colorVariation: 0.2
     }
     PointAttractor{
-        id: gs; x: root.width/2; y: root.height/2; strength: 4000000;
+        id: gs; pointX: root.width/2; pointY: root.height/2; strength: 4000000;
         system: particles
         physics: PointAttractor.Acceleration
         proportionalToDistance: PointAttractor.InverseQuadratic

diff --git a/examples/declarative/particles/modelparticles/stream.qml b/examples/declarative/particles/modelparticles/stream.qml
@@ -149,8 +149,8 @@ Item{
     PointAttractor{
         id: force
         system: sys
-        x: root.width/2
-        y: root.height/2
+        pointX: root.width/2
+        pointY: root.height/2
         strength: -10000
         active: false
         anchors.centerIn: parent

diff --git a/examples/declarative/particles/spaceexplorer/spaceexplorer.qml b/examples/declarative/particles/spaceexplorer/spaceexplorer.qml
@@ -275,51 +275,51 @@ Rectangle{
         system: foreground
     }
     PointAttractor{
-        id: gs1; x: vorteX; y: vorteY; strength: 800000;
         proportionalToDistance: PointAttractor.InverseQuadratic;
+        id: gs1; pointX: vorteX; pointY: vorteY; strength: 800000;
         system: foreground
     }
     Kill{
-        x: gs1.x - holeSize;
-        y: gs1.y - holeSize;
+        x: gs1.pointX - holeSize;
+        y: gs1.pointY - holeSize;
         width: holeSize * 2
         height: holeSize * 2
         system: foreground
     }
 
     PointAttractor{
-        id: gs2; x: vorteX2; y: vorteY2; strength: 800000;
         proportionalToDistance: PointAttractor.InverseQuadratic;
+        id: gs2; pointX: vorteX2; pointY: vorteY2; strength: 800000;
         system: foreground
     }
     Kill{
-        x: gs2.x - holeSize;
-        y: gs2.y - holeSize;
+        x: gs2.pointX - holeSize;
+        y: gs2.pointY - holeSize;
         width: holeSize * 2
         height: holeSize * 2
         system: foreground
     }
 
     PointAttractor{
-        id: gs3; x: vorteX3; y: vorteY3; strength: 800000;
         proportionalToDistance: PointAttractor.InverseQuadratic;
+        id: gs3; pointX: vorteX3; pointY: vorteY3; strength: 800000;
         system: foreground
     }
     Kill{
-        x: gs3.x - holeSize;
-        y: gs3.y - holeSize;
+        x: gs3.pointX - holeSize;
+        y: gs3.pointY - holeSize;
         width: holeSize * 2
         height: holeSize * 2
         system: foreground
     }
     PointAttractor{
-        id: gs4; x: vorteX4; y: vorteY4; strength: 800000;
-        proportionalToDistance: PointAttractor.Quadratic;
+        id: gs4; pointX: vorteX4; pointY: vorteY4; strength: 800000;
+        proportionalToDistance: PointAttractor.InverseQuadratic;
         system: foreground
     }
     Kill{
-        x: gs4.x - holeSize;
-        y: gs4.y - holeSize;
+        x: gs4.pointX - holeSize;
+        y: gs4.pointY - holeSize;
         width: holeSize * 2
         height: holeSize * 2
         system: foreground

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
@@ -8,7 +8,6 @@ MODULE_PRI += ../../modules/qt_declarative.pri
 
 QT = core-private gui gui-private network widgets-private sql v8-private
 
-contains(QT_CONFIG, svg): QT += svg
 DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2