diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 09:33:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 09:33:35 (GMT) |
| commit | 78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0 (patch) | |
| tree | ad6ea9ebd921cb1c3ee896f4f29cb52f1b6dcdfb /demos | |
| parent | 71dedbee1f5a23411e2c82157a6fe6ee5d48ab6e (diff) | |
| parent | 02bdd61245da529ff99cdebc939b33fefe398f48 (diff) | |
| download | Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.zip Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.tar.gz Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.tar.bz2 | |
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: (63 commits)
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
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
10n: Update German translation for 4.7.0
Redesigned filter widgets
Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
Add Japanese/Korean keyboard specific keys to QKeySequence
Fixed qmdiarea autotest regression on Cocoa
Fix JSC export macros
Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
Incorrect translation for Application menu items in Mac.
doc: Fixed use of Qt 3 support function in QIcon doc snippet
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
...
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.cpp | 18 |
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: |