diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-11-24 09:12:02 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-11-24 08:35:05 +0000 |
| commit | 971292a044e06da55c74152e3873547e122f7d7c (patch) | |
| tree | 4f767b04dd84fe89c4533970a0918608cb76cea4 | |
| parent | 2fad6f2c38aac98197bff39d9a541455744069f2 (diff) | |
| download | qt-creator-971292a044e06da55c74152e3873547e122f7d7c.tar.gz | |
Remove last nokia references in comments
Change-Id: Ic5b815061212f66af5e36396b9a2b94cfbdfbe52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -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> |