Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
71b9057b
Commit
71b9057b
authored
Apr 26, 2010
by
Christian Kamm
Browse files
QmlJS: The qml document's path is no longer an implicit import path.
parent
aa092690
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/libs/qmljs/qmljslink.cpp
View file @
71b9057b
...
...
@@ -275,9 +275,7 @@ void Link::importNonFile(Interpreter::ObjectValue *typeEnv, Document::Ptr doc, A
}
else
{
// check the filesystem
const
QString
packagePath
=
Bind
::
toString
(
import
->
importUri
,
QDir
::
separator
());
QStringList
localImportPaths
=
_importPaths
;
localImportPaths
.
prepend
(
doc
->
path
());
foreach
(
const
QString
&
importPath
,
localImportPaths
)
{
foreach
(
const
QString
&
importPath
,
_importPaths
)
{
QDir
dir
(
importPath
);
if
(
!
dir
.
cd
(
packagePath
))
continue
;
...
...
src/plugins/qmljseditor/qmljsmodelmanager.cpp
View file @
71b9057b
...
...
@@ -245,8 +245,7 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap
QStringList
*
importedFiles
,
QSet
<
QString
>
*
scannedPaths
)
{
// scan library imports
QStringList
importPaths
=
modelManager
->
importPaths
();
importPaths
.
prepend
(
doc
->
path
());
const
QStringList
importPaths
=
modelManager
->
importPaths
();
foreach
(
const
QString
&
libraryImport
,
doc
->
bind
()
->
libraryImports
())
{
foreach
(
const
QString
&
importPath
,
importPaths
)
{
QDir
dir
(
importPath
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment