diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-24 08:54:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-24 08:54:59 (GMT) |
| commit | 7cca3020efcb2db790c73393c94458646818cbbe (patch) | |
| tree | d256f07d426289e05a1268e704e7dc2b30b7d3e2 /src | |
| parent | 5e91a0a3add3b100fcae58eca7f700db12a456b4 (diff) | |
| parent | 4b26e5059fce5fcfa500729a1b34fe1c4021eab1 (diff) | |
| download | Qt-7cca3020efcb2db790c73393c94458646818cbbe.zip Qt-7cca3020efcb2db790c73393c94458646818cbbe.tar.gz Qt-7cca3020efcb2db790c73393c94458646818cbbe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Small fixes to Browser.qml
More declarative autotests.
Fix example.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 985ab72..f0c62f4 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -119,7 +119,7 @@ int qmlRegisterType() return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type); } -int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message); +int Q_AUTOTEST_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message); template<typename T> int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason) |