diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
| commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
| tree | 08fa39a9605ec38a45247baea0e2053179f5970f /src/declarative/util/qdeclarativetimer_p.h | |
| parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 | |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
Diffstat (limited to 'src/declarative/util/qdeclarativetimer_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativetimer_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index 93b0965..08c3d4e 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTimerPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTimer) |