Check QMLType when adding new QML files to project to prevent error message being shown

Change-Id: I68df3c69b535d47109bfb94c3089fd78e8b3683d
Reviewed-on: http://codereview.qt.nokia.com/514


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -174,6 +174,7 @@ const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
 const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
 const char * const FORM_MIMETYPE = "application/x-designer";
+const char * const QML_MIMETYPE = "application/x-qml";
 const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
 
 // settings page

src/plugins/projectexplorer/projectnodes.cpp

@@ -754,5 +754,7 @@ FileType typeForFileName(const Core::MimeDatabase *db, const QFileInfo &file)
         return ResourceType;
     if (typeName == QLatin1String(Constants::FORM_MIMETYPE))
         return FormType;
+    if (typeName == QLatin1String(Constants::QML_MIMETYPE))
+        return QMLType;
     return UnknownFileType;
 }

src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp

@@ -213,7 +213,7 @@ QString FileFilterBaseItem::absoluteDir() const
         absoluteDir = m_defaultDir + QLatin1Char('/') + m_rootDir;
     }
 
-    return absoluteDir;
+    return QDir::cleanPath(absoluteDir);
 }
 
 void FileFilterBaseItem::updateFileList()

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -1187,6 +1187,7 @@ QStringList Qt4PriFileNode::varNames(ProjectExplorer::FileType type)
         vars << QLatin1String("SUBDIRS");
         break;
     case ProjectExplorer::QMLType:
+        vars << QLatin1String("OTHER_FILES");
         break;
     default:
         vars << QLatin1String("OTHER_FILES");