diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 06:00:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 06:00:42 (GMT) |
| commit | e34c985579b9728ab4f7e9761b5ede0528fc7eee (patch) | |
| tree | bbab4d1b3da156fd9c24dc3c1deaec0a5b7f16d7 /src | |
| parent | 2a41640f3147acf801e5fdc7e6867b6cd93422a3 (diff) | |
| parent | af76bc9f2f2fe345b1f1c9ae537acbb351b499e8 (diff) | |
| download | Qt-e34c985579b9728ab4f7e9761b5ede0528fc7eee.zip Qt-e34c985579b9728ab4f7e9761b5ede0528fc7eee.tar.gz Qt-e34c985579b9728ab4f7e9761b5ede0528fc7eee.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) |