Skip to content
GitLab
Menu
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
335d437f
Commit
335d437f
authored
Feb 03, 2011
by
Christian Kamm
Browse files
QmlDesigner: Fix problem with QtWebKit/WebView.
Done-with: Marco Bubke
parent
06496571
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View file @
335d437f
...
...
@@ -523,7 +523,7 @@ void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode, con
if
(
fxObjectNode
.
isValid
()
&&
m_currentType
&&
fxObjectNode
==
m_selectedNode
&&
fxObjectNode
.
currentState
().
isValid
())
{
AbstractProperty
property
=
fxObjectNode
.
modelNode
().
property
(
propertyName
);
if
(
fxObjectNode
==
m_selectedNode
||
QmlObjectNode
(
m_selectedNode
).
propertyChangeForCurrentState
()
==
fxObjectNode
)
{
if
(
m_selectedNode
.
property
(
property
.
name
()).
isBindingProperty
()
||
!
m_selectedNode
.
hasProperty
(
propertyName
)
)
if
(
!
m_selectedNode
.
hasProperty
(
propertyName
)
||
m_selectedNode
.
property
(
property
.
name
()).
isBindingProperty
()
)
setValue
(
m_selectedNode
,
property
.
name
(),
QmlObjectNode
(
m_selectedNode
).
instanceValue
(
property
.
name
()));
else
setValue
(
m_selectedNode
,
property
.
name
(),
QmlObjectNode
(
m_selectedNode
).
modelValue
(
property
.
name
()));
...
...
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View file @
335d437f
...
...
@@ -446,7 +446,7 @@ NodeMetaInfoPrivate::NodeMetaInfoPrivate(Model *model, QString type, int maj, in
const
QmlJS
::
Interpreter
::
QmlObjectValue
*
NodeMetaInfoPrivate
::
getQmlObjectValue
()
const
{
return
lookupContext
()
->
engine
()
->
cppQmlTypes
().
type
s
().
valu
e
(
lookupName
());
return
lookupContext
()
->
engine
()
->
cppQmlTypes
().
type
ByQualifiedNam
e
(
lookupName
());
}
const
QmlJS
::
Interpreter
::
ObjectValue
*
NodeMetaInfoPrivate
::
getObjectValue
()
const
...
...
@@ -647,6 +647,7 @@ bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const
if
(
isComponent
())
return
false
;
QStringList
split
=
otherType
.
split
(
'/'
);
QString
package
;
QString
typeName
=
otherType
;
...
...
@@ -742,17 +743,19 @@ QString NodeMetaInfoPrivate::componentFileName() const
QString
NodeMetaInfoPrivate
::
lookupName
()
const
{
QString
tempString
=
m_qualfiedTypeName
;
tempString
.
replace
(
'/'
,
'.'
);
if
(
!
tempString
.
contains
(
'.'
))
tempString
.
prepend
(
'.'
);
tempString
.
append
(
' '
);
QString
className
=
m_qualfiedTypeName
;
QString
packageName
;
tempString
.
append
(
QString
::
number
(
m_majorVersion
));
tempString
.
append
(
'.'
);
tempString
.
append
(
QString
::
number
(
m_minorVersion
));
QStringList
packageClassName
=
m_qualfiedTypeName
.
split
(
QLatin1Char
(
'/'
));
if
(
packageClassName
.
size
()
>
1
)
{
className
=
packageClassName
.
takeLast
();
packageName
=
packageClassName
.
join
(
QLatin1String
(
"."
));
}
return
tempString
;
return
Interpreter
::
CppQmlTypes
::
qualifiedName
(
packageName
,
className
,
LanguageUtils
::
ComponentVersion
(
m_majorVersion
,
m_minorVersion
));
}
QStringList
NodeMetaInfoPrivate
::
lookupNameComponent
()
const
...
...
@@ -792,10 +795,11 @@ void NodeMetaInfoPrivate::setupPrototypes()
description
.
majorVersion
=
qmlValue
->
version
().
majorVersion
();
if
(
!
qmlValue
->
packageName
().
isEmpty
())
description
.
className
=
qmlValue
->
packageName
()
+
"/"
+
description
.
className
;
}
if
(
lookupContext
()
->
context
()
->
lookupType
(
document
(),
QStringList
()
<<
ov
->
className
()))
m_prototypes
.
append
(
description
);
}
else
{
if
(
lookupContext
()
->
context
()
->
lookupType
(
document
(),
QStringList
()
<<
ov
->
className
()))
m_prototypes
.
append
(
description
);
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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