diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-31 11:11:03 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-31 11:11:03 (GMT) |
| commit | 59e281bcc2bc24ae93eaf2751cc6fcc48bfd6302 (patch) | |
| tree | 4a88791a8457116b020e99d39281797252d3330a | |
| parent | aa0b5d35b29fd2f23223e5a4eca4b0d48c74cb2f (diff) | |
| parent | e845c0d7a8ed33f2aa2a3ae5ebce931ea2043037 (diff) | |
| download | Qt-59e281bcc2bc24ae93eaf2751cc6fcc48bfd6302.zip Qt-59e281bcc2bc24ae93eaf2751cc6fcc48bfd6302.tar.gz Qt-59e281bcc2bc24ae93eaf2751cc6fcc48bfd6302.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
| -rw-r--r-- | src/imports/folderlistmodel/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.h | 4 | ||||
| -rw-r--r-- | tools/porting/src/codemodel.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index 555df3c..1ec6106 100644 --- a/src/imports/folderlistmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -53,7 +53,9 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.folderlistmodel")); +#ifndef QT_NO_DIRMODEL qmlRegisterType<QDeclarativeFolderListModel>(uri,1,0,"FolderListModel"); +#endif } }; //![class decl] diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index fccb9d4..9cf81ca 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -45,6 +45,8 @@ #include <QDebug> #include <qdeclarativecontext.h> +#ifndef QT_NO_DIRMODEL + QT_BEGIN_NAMESPACE class QDeclarativeFolderListModelPrivate @@ -397,3 +399,5 @@ void QDeclarativeFolderListModel::setShowOnlyReadable(bool on) //![code] QT_END_NAMESPACE + +#endif // QT_NO_DIRMODEL diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h index ea7d701..1bab5f84 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h @@ -47,6 +47,8 @@ #include <QUrl> #include <QAbstractListModel> +#ifndef QT_NO_DIRMODEL + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -152,4 +154,6 @@ QML_DECLARE_TYPE(QDeclarativeFolderListModel) QT_END_HEADER +#endif // QT_NO_DIRMODEL + #endif // QDECLARATIVEFOLDERLISTMODEL_H diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h index cb3088f..04ad178 100644 --- a/tools/porting/src/codemodel.h +++ b/tools/porting/src/codemodel.h @@ -96,7 +96,7 @@ class Collection: public QMultiHash<QByteArray, CollectedType *> { public: void add(CollectedType *collectedItem) - { insert(collectedItem->name(), collectedItem); } + { this->insert(collectedItem->name(), collectedItem); } }; typedef Collection<Scope> ScopeCollection; |