diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 21:10:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 21:10:25 (GMT) |
| commit | 8acec3d5d5adffe2e477d806e3464f7906a771cc (patch) | |
| tree | 28140786fcd46c3bd11b42740ec9f8683fdd95df /src | |
| parent | 25f856c5719ea903db7d636a54b2145875c1f1ed (diff) | |
| parent | e34c985579b9728ab4f7e9761b5ede0528fc7eee (diff) | |
| download | Qt-8acec3d5d5adffe2e477d806e3464f7906a771cc.zip Qt-8acec3d5d5adffe2e477d806e3464f7906a771cc.tar.gz Qt-8acec3d5d5adffe2e477d806e3464f7906a771cc.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) |