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: (114 commits)
  Fix the test of QDirIterator with NoDot and NoDotDot
  Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
  QFSFileEngine: don't look through NTFS junctions
  After showing modal windows, WM_LBUTTONUP for double click is ignored.
  Possible fix for missing QML properties in the qt.qhp file.
  Use standard theme icons in Linguist where possible
  Use more standard icons from the theme in Assistant
  Use more standard icons for standard actions in Designer
  Drag & drop operations wont end while using Remote Desktop sessions
  _close(fd) closes the associated handle and not the other way around
  Fixed locale mapping on Symbian.
  Revert change 7bf4512659 on Cocoa.
  Extended the high_attributes array, since we have more than 127 widget attributes now.
  Added instructions for MinGW users wanting to build the MySQL driver.
  Designer: Fix broken resource view.
  Add missing ,.
  get rid of build warning messages
  Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.
  Add configure test for Maemo Internet Connection Daemon.
  fix warning
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 5e44d1b..e5f1ddb 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -54,16 +54,16 @@ class Tile : public QObject
 public:
     Tile() : _hasFlag(false), _hasMine(false), _hint(-1), _flipped(false) {}
 
-    Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged);
+    Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged)
     bool hasFlag() const { return _hasFlag; }
 
-    Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged);
+    Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged)
     bool hasMine() const { return _hasMine; }
 
-    Q_PROPERTY(int hint READ hint NOTIFY hintChanged);
+    Q_PROPERTY(int hint READ hint NOTIFY hintChanged)
     int hint() const { return _hint; }
 
-    Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged());
+    Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged())
     bool flipped() const { return _flipped; }
 
     void setHasFlag(bool flag) {if(flag==_hasFlag) return; _hasFlag = flag; emit hasFlagChanged();}
@@ -91,19 +91,19 @@ class MinehuntGame : public QObject
 public:
     MinehuntGame();
 
-    Q_PROPERTY(QDeclarativeListProperty<Tile> tiles READ tiles CONSTANT);
+    Q_PROPERTY(QDeclarativeListProperty<Tile> tiles READ tiles CONSTANT)
     QDeclarativeListProperty<Tile> tiles() { return QDeclarativeListProperty<Tile>(this, _tiles); }
 
-    Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged);
+    Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
     bool isPlaying() {return playing;}
 
-    Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged);
+    Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged)
     bool hasWon() {return won;}
 
-    Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged);
+    Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged)
     int numMines() const{return nMines;}
 
-    Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged);
+    Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged)
     int numFlags() const{return nFlags;}
 
 public slots: