feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: differnt language constants for the different qml flavors

Browse Source 
Added separated qbs, qmltypes, QtQuick1, and QtQuick2
and "generic" Qml languages.
Cleaned up the mime types a bit, preparing for registered mime
types.

Change-Id: I0e484c93e003176cd659acc546baa6d024defa19
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2012-12-06 12:11:12 +01:00
parent a839a46d4f
commit 174baf5ea1
14 changed files with 92 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlprojectconstants.h
View File

@@ -30,12 +30,14 @@
#ifndef QMLPROJECTCONSTANTS_H
#define QMLPROJECTCONSTANTS_H
#include <qmljstools/qmljstoolsconstants.h>
namespace QmlProjectManager {
namespace Constants {
const char *const PROJECTCONTEXT = "QmlProject.ProjectContext";
const char *const LANG_QML = "QML";
const char *const QMLMIMETYPE = "application/x-qmlproject";
const char *const QMLPROJECT_MIMETYPE = QmlJSTools::Constants::QMLPROJECT_MIMETYPE;
} // namespace Constants
} // namespace QmlProjectManager

2
src/plugins/qmlprojectmanager/qmlprojectfile.cpp
View File

@@ -77,7 +77,7 @@ QString QmlProjectFile::suggestedFileName() const
QString QmlProjectFile::mimeType() const
{
return QLatin1String(Constants::QMLMIMETYPE);
return QLatin1String(Constants::QMLPROJECT_MIMETYPE);
}
bool QmlProjectFile::isModified() const

2
src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
View File

@@ -47,7 +47,7 @@ Manager::Manager()
}
QString Manager::mimeType() const
{ return QLatin1String(Constants::QMLMIMETYPE); }
{ return QLatin1String(Constants::QMLPROJECT_MIMETYPE); }
ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString *errorString)
{