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: (78 commits)
  Moc: Add support for rvalue references in signals and slots.
  Add support for polyphonic greek
  Fix build failure on WinCE.
  Autotests: if you use X11 libs, you must link to X11 libs explicitly.
  Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
  Compile Phonon in C++0x mode.
  Compile Qt in C++0x mode.
  Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
  Fix cast-from-ascii warning
  Fix compilation on Linux
  Fix compilation with WINSCW: #include doesn't find files in the same dir
  Rename m_volume to m_vol
  Add 2 signals, introduce side widget, make it possible to reset startId
  Do not create native window handle just because a parent has one.
  Tab color fix for document mode on Snow Leopard.
  Revert "Don't emit open signal on session close/error."
  Rename networkAccess property to networkAccessible.
  Don't emit open signal on session close/error.
  Rename private signal.
  Autotest: fix instability by accepting rounding errors
  ...

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: