diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-10 22:35:31 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-10 22:35:31 (GMT) |
| commit | ca13ba801144763b1ca7c39b2ef8594de94e2d3e (patch) | |
| tree | 7600e31df6ce715a5bc28c0c97983bac9484c7cb /src/declarative/qml/qdeclarativeglobal_p.h | |
| parent | ab38731fe5dcfaa1a7a70bc290a8856b5b01524d (diff) | |
| parent | ec20a6da3edea3031f1705c3b13e24dc2c7c6de5 (diff) | |
| download | Qt-ca13ba801144763b1ca7c39b2ef8594de94e2d3e.zip Qt-ca13ba801144763b1ca7c39b2ef8594de94e2d3e.tar.gz Qt-ca13ba801144763b1ca7c39b2ef8594de94e2d3e.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into HEAD
Diffstat (limited to 'src/declarative/qml/qdeclarativeglobal_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeglobal_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h index b759056..6d195c7 100644 --- a/src/declarative/qml/qdeclarativeglobal_p.h +++ b/src/declarative/qml/qdeclarativeglobal_p.h @@ -65,7 +65,7 @@ QT_MODULE(Declarative) } #ifdef Q_OS_SYMBIAN -#define Q_DECLARATIVE_PRIVATE_EXPORT +#define Q_DECLARATIVE_PRIVATE_EXPORT Q_AUTOTEST_EXPORT #else #define Q_DECLARATIVE_PRIVATE_EXPORT Q_DECLARATIVE_EXPORT #endif |