diff -r 5dc02b23752f -r 3e2da88830cd src/imports/folderlistmodel/plugin.cpp --- a/src/imports/folderlistmodel/plugin.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/imports/folderlistmodel/plugin.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -53,7 +53,9 @@ virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.folderlistmodel")); +#ifndef QT_NO_DIRMODEL qmlRegisterType(uri,1,0,"FolderListModel"); +#endif } }; //![class decl]