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: (31 commits)
  Fix compilation with Sun CC: no semi-colon after Q_ENUM.
  Remove the "Insert unicode control character" menu entry on X11.
  adds a timeout option to QThreadPool::waitForDone();
  Remove leading whitespace from Qt header macros.
  Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
  Add QDateTime members that operate on 64-bit milliseconds.
  Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
  qdoc: Added <div> elements to some html output for class references.
  Fix compile error on mingw.
  MONILITY-645
  Do not override alternate background color in Plastique
  Fix QComboBox ignoring foreground role in some styles
  Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
  Fix compilation with Sun CC:
  Ensure that we return QPair<long,long> in all cases.
  Update PLATFORM(SPARC64) to CPU(SPARC64)
  jui files are no c++ ...
  scan some more file types by default
  Support EtchDisabledText with spin box on Windows style
  QNAM HTTP: Fix invoking a method when being destructed right now
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 0079891..a00f4c0 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -77,7 +77,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativePathView : public QDeclarativeItem
     Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount NOTIFY pathItemCountChanged)
 
-    Q_ENUMS(HighlightRangeMode);
+    Q_ENUMS(HighlightRangeMode)
 
 public:
     QDeclarativePathView(QDeclarativeItem *parent=0);