Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
  Revert "Split Symbian bearer plugin into three platform specfic plugins"
  Don't poll non-polling engines when configurations are in use.
  Doc: updating images
  Fix a corner case where a gesture sometimes doesn't start.
  write PO files without duplicated message ids
  my changes
  Fix failing bypassShaping autotest on the Mac OS X
  More Pixmap cache key optimizations
  QNAM: Improve child deletion order
  QSslCertificate: support large serial numbers
  Split Symbian bearer plugin into three platform specfic plugins
  Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting
  Some optimizations for QImage::load()
  fix setRawData()
  Fix QML crashes on the N900
  doc: Added DITA XML generator
  Fix build failure on Symbian 3.1.
  Add the Qt::TextBypassShaping flag.
  QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
  Add my 4.7.0 changes
  ...

3 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index d75f0a8..53ff51c 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -67,7 +67,7 @@ QT_BEGIN_HEADER
     QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
 
 enum { /* TYPEINFO flags */
-    QML_HAS_ATTACHED_PROPERTIES = 0x01,
+    QML_HAS_ATTACHED_PROPERTIES = 0x01
 };
 
 #define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index dc5f2f8..4627eb3 100644
--- a/src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -158,7 +158,7 @@ public:
         // 
         // Deferred creation
         //
-        Defer,                    /* defer */
+        Defer                    /* defer */
     };
     QDeclarativeInstruction()
         : line(0) {}
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 476c73d..3eaecc1 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -446,7 +446,7 @@ public:
         InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce,
         InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce,
         InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve,
-        SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve,
+        SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve
     };
 
     QDeclarativeEasingValueType(QObject *parent = 0);