diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 1 | ||||
| -rw-r--r-- | src/libs/utils/mimetypes/mimedatabase.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index c198072006..1f436160c0 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -367,7 +367,6 @@ static ModuleApiInfo findBestModuleApi(const QList<ModuleApiInfo> &apis, const C /* import Qt 4.6 import Qt 4.6 as Xxx - (import com.nokia.qt is the same as the ones above) */ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInfo) { diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp index 8f36b241c8..a3c5806c03 100644 --- a/src/libs/utils/mimetypes/mimedatabase.cpp +++ b/src/libs/utils/mimetypes/mimedatabase.cpp @@ -280,7 +280,7 @@ bool MimeDatabasePrivate::inherits(const QString &mime, const QString &parent) \code <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/vnd.nokia.qt.qmakeprofile"> + <mime-type type="application/vnd.qt.qmakeprofile"> <comment xml:lang="en">Qt qmake Profile</comment> <glob pattern="*.pro" weight="50"/> </mime-type> |