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
Marco Bubke
flatpak-qt-creator
Commits
6a9e88c3
Commit
6a9e88c3
authored
May 16, 2011
by
Thomas Hartmann
Browse files
QmlDesigner.textToModelMerger: use fully qualified types
We now use fully qualified types also for components.
parent
378f08db
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View file @
6a9e88c3
...
...
@@ -54,6 +54,7 @@
#include
<QtCore/QSet>
#include
<QtGui/QMessageBox>
#include
<QDir>
using
namespace
LanguageUtils
;
using
namespace
QmlJS
;
...
...
@@ -341,8 +342,33 @@ public:
for
(
UiQualifiedId
*
iter
=
astTypeNode
;
iter
;
iter
=
iter
->
next
)
if
(
!
iter
->
next
&&
iter
->
name
)
typeName
=
iter
->
name
->
asString
();
QString
fullTypeName
;
for
(
UiQualifiedId
*
iter
=
astTypeNode
;
iter
;
iter
=
iter
->
next
)
if
(
iter
->
name
)
fullTypeName
+=
iter
->
name
->
asString
()
+
"."
;
if
(
fullTypeName
.
endsWith
(
"."
))
fullTypeName
.
chop
(
1
);
majorVersion
=
ComponentVersion
::
NoVersion
;
minorVersion
=
ComponentVersion
::
NoVersion
;
const
Interpreter
::
TypeEnvironment
*
typeEnv
=
m_lookupContext
->
context
()
->
typeEnvironment
(
m_lookupContext
->
document
().
data
());
Interpreter
::
ImportInfo
importInfo
=
typeEnv
->
importInfo
(
fullTypeName
,
m_context
);
if
(
importInfo
.
isValid
()
&&
importInfo
.
type
()
==
Interpreter
::
ImportInfo
::
LibraryImport
)
{
QString
name
=
importInfo
.
name
().
replace
(
"
\\
"
,
"."
);
majorVersion
=
importInfo
.
version
().
majorVersion
();
minorVersion
=
importInfo
.
version
().
minorVersion
();
typeName
.
prepend
(
name
+
"."
);
}
else
if
(
importInfo
.
isValid
()
&&
importInfo
.
type
()
==
Interpreter
::
ImportInfo
::
DirectoryImport
)
{
QString
path
=
importInfo
.
name
();
QDir
dir
(
m_doc
->
path
());
QString
relativeDir
=
dir
.
relativeFilePath
(
path
);
QString
name
=
relativeDir
.
replace
(
"/"
,
"."
);
if
(
!
name
.
isEmpty
())
typeName
.
prepend
(
name
+
"."
);
}
}
}
...
...
@@ -1370,7 +1396,7 @@ ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProp
if
(
!
astObjectType
||
!
astInitializer
)
return
ModelNode
();
QString
typeName
,
dummy
;
QString
typeName
,
fullTypeName
,
dummy
;
int
majorVersion
;
int
minorVersion
;
context
->
lookup
(
astObjectType
,
typeName
,
majorVersion
,
minorVersion
,
dummy
);
...
...
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