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

Remove last nokia references in comments

Browse Source 
Change-Id: Ic5b815061212f66af5e36396b9a2b94cfbdfbe52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2016-11-24 09:12:02 +02:00
committed by Orgad Shaneh
parent 2fad6f2c38
commit 971292a044
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/qmljs/qmljslink.cpp
View File

@@ -367,7 +367,6 @@ static ModuleApiInfo findBestModuleApi(const QList<ModuleApiInfo> &apis, const C
/* /*
import Qt 4.6 import Qt 4.6
import Qt 4.6 as Xxx 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) Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInfo)
{ {

2
src/libs/utils/mimetypes/mimedatabase.cpp
View File

@@ -280,7 +280,7 @@ bool MimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
\code \code
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <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> <comment xml:lang="en">Qt qmake Profile</comment>
<glob pattern="*.pro" weight="50"/> <glob pattern="*.pro" weight="50"/>
</mime-type> </mime-type>