diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
| commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
| tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/qml/qml/qqmlincubator.h | |
| parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
| parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/qml/qml/qqmlincubator.h')
| -rw-r--r-- | src/qml/qml/qqmlincubator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlincubator.h b/src/qml/qml/qqmlincubator.h index 5d8ae7d6c3..2fb2aaf2f1 100644 --- a/src/qml/qml/qqmlincubator.h +++ b/src/qml/qml/qqmlincubator.h @@ -42,6 +42,7 @@ #ifndef QQMLINCUBATOR_H #define QQMLINCUBATOR_H +#include <QtQml/qtqmlglobal.h> #include <QtQml/qqmlerror.h> QT_BEGIN_HEADER @@ -110,7 +111,7 @@ public: int incubatingObjectCount() const; void incubateFor(int msecs); - void incubateWhile(bool *flag); + void incubateWhile(volatile bool *flag, int msecs=0); protected: virtual void incubatingObjectCountChanged(int); |