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
300f90f1
Commit
300f90f1
authored
Apr 13, 2010
by
Kai Koehne
Browse files
Revert "QmlDesigner: Remove 'variant' as qml type"
Actually it's 'variant' now, not 'var' any more Reviewed-by: Thomas Hartmann
parent
5650dbc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
View file @
300f90f1
...
@@ -420,12 +420,14 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &originalVariant) const
...
@@ -420,12 +420,14 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &originalVariant) const
return
variant
;
return
variant
;
}
else
if
(
typeId
==
QVariant
::
UserType
&&
m_data
->
type
==
QLatin1String
(
"QVariant"
))
{
}
else
if
(
typeId
==
QVariant
::
UserType
&&
m_data
->
type
==
QLatin1String
(
"QVariant"
))
{
return
variant
;
return
variant
;
}
else
if
(
typeId
==
QVariant
::
UserType
&&
m_data
->
type
==
QLatin1String
(
"variant"
))
{
return
variant
;
}
else
if
(
typeId
==
QVariant
::
UserType
&&
m_data
->
type
==
QLatin1String
(
"var"
))
{
}
else
if
(
typeId
==
QVariant
::
UserType
&&
m_data
->
type
==
QLatin1String
(
"var"
))
{
return
variant
;
return
variant
;
}
else
if
(
variant
.
type
()
==
QVariant
::
List
&&
variant
.
type
()
==
QVariant
::
List
)
{
}
else
if
(
variant
.
type
()
==
QVariant
::
List
&&
variant
.
type
()
==
QVariant
::
List
)
{
// TODO: check the contents of the list
// TODO: check the contents of the list
return
variant
;
return
variant
;
}
else
if
(
type
()
==
"var"
)
{
}
else
if
(
type
()
==
"var"
||
type
()
==
"variant"
)
{
return
variant
;
return
variant
;
}
else
if
(
type
()
==
"alias"
)
{
}
else
if
(
type
()
==
"alias"
)
{
// TODO: The QML compiler resolves the alias type. We probably should do the same.
// TODO: The QML compiler resolves the alias type. We probably should do the same.
...
...
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
View file @
300f90f1
...
@@ -148,7 +148,7 @@ static inline int propertyType(const QString &typeName)
...
@@ -148,7 +148,7 @@ static inline int propertyType(const QString &typeName)
return
QMetaType
::
type
(
"QString"
);
return
QMetaType
::
type
(
"QString"
);
else
if
(
typeName
==
QLatin1String
(
"url"
))
else
if
(
typeName
==
QLatin1String
(
"url"
))
return
QMetaType
::
type
(
"QUrl"
);
return
QMetaType
::
type
(
"QUrl"
);
else
if
(
typeName
==
QLatin1String
(
"var"
))
else
if
(
typeName
==
QLatin1String
(
"var"
)
||
typeName
==
QLatin1String
(
"variant"
)
)
return
QMetaType
::
type
(
"QVariant"
);
return
QMetaType
::
type
(
"QVariant"
);
else
else
return
-
1
;
return
-
1
;
...
...
Write
Preview
Markdown
is supported
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