diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 18:58:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 18:58:17 (GMT) |
| commit | 7b796b4dcdebfba55c4754d241edb334217fc550 (patch) | |
| tree | d9dc239f7172a5e64c03462ae741771b72fcdc44 /src/declarative | |
| parent | 53f5b448f5dd33459837536a855463c917b4c14e (diff) | |
| parent | 858469445ceb745c70dad9cd4f913acc34683e15 (diff) | |
| download | Qt-7b796b4dcdebfba55c4754d241edb334217fc550.zip Qt-7b796b4dcdebfba55c4754d241edb334217fc550.tar.gz Qt-7b796b4dcdebfba55c4754d241edb334217fc550.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:
Add export to QDeclarativeBasePositioner
Fix assert when placing a .qml file inside $QTDIR/imports
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index f9ecc0a..15b91e5 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeBasePositionerPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem +class Q_DECLARATIVE_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem { Q_OBJECT diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 8f95e26..fe4ed48 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -876,6 +876,7 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path) cPath = dir.canonicalPath(); } else { cPath = path; + cPath.replace(QLatin1Char('\\'), QLatin1Char('/')); } if (!cPath.isEmpty() |