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
64839753
Commit
64839753
authored
Jun 18, 2010
by
Alexis Menard
Browse files
QML WebKit component is now named QtWebKit
Reviewed-by:Christiaan Janssen
parent
e8373b9d
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
View file @
64839753
...
...
@@ -134,7 +134,7 @@ Internal::ObjectNodeInstance::Pointer NodeInstance::createInstance(const NodeMet
if
(
!
metaInfo
.
isValid
())
instance
=
Internal
::
DummyNodeInstance
::
create
();
else
if
(
metaInfo
.
isSubclassOf
(
"
org.w
eb
k
it/WebView"
,
1
,
0
))
else
if
(
metaInfo
.
isSubclassOf
(
"
QtW
eb
K
it/WebView"
,
1
,
0
))
instance
=
Internal
::
DummyNodeInstance
::
create
();
else
if
(
metaInfo
.
isSubclassOf
(
"Qt/QWidget"
,
4
,
7
))
instance
=
Internal
::
DummyNodeInstance
::
create
();
...
...
src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
View file @
64839753
...
...
@@ -130,7 +130,7 @@ void MetaInfoPrivate::loadPlugins(QDeclarativeEngine *engine)
QStringList
pluginList
;
pluginList
+=
"import Qt 4.7"
;
pluginList
+=
"import
org.w
eb
k
it 1.0"
;
pluginList
+=
"import
QtW
eb
K
it 1.0"
;
// load maybe useful plugins
pluginList
+=
"import Qt.labs.folderlistmodel 1.0"
;
...
...
src/plugins/qmldesigner/fxplugin/fx.metainfo
View file @
64839753
...
...
@@ -111,7 +111,7 @@
</itemlibraryentry>
</node>
<node name="
org.w
eb
k
it/WebView" icon=":/fxplugin/images/webview-icon16.png">
<node name="
QtW
eb
K
it/WebView" icon=":/fxplugin/images/webview-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Web View" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon.png">
...
...
src/tools/qml/qmldump/main.cpp
View file @
64839753
...
...
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
code
+=
"import Qt.labs.particles 4.7;
\n
"
;
code
+=
"import Qt.labs.gestures 4.7;
\n
"
;
code
+=
"import Qt.labs.folderlistmodel 4.7;
\n
"
;
code
+=
"import
org.w
eb
k
it 1.0;
\n
"
;
code
+=
"import
QtW
eb
K
it 1.0;
\n
"
;
code
+=
"Item {}"
;
QDeclarativeComponent
c
(
engine
);
c
.
setData
(
code
,
QUrl
(
"xxx"
));
...
...
tests/auto/qml/qmldesigner/coretests/testcore.cpp
View file @
64839753
...
...
@@ -803,10 +803,10 @@ void TestCore::testRewriterImports()
QVERIFY
(
!
import
.
hasVersion
());
QVERIFY
(
!
import
.
hasAlias
());
// import
org.w
eb
k
it 1.0 as Web
// import
QtW
eb
K
it 1.0 as Web
import
=
model
->
imports
().
at
(
2
);
QVERIFY
(
import
.
isLibraryImport
());
QCOMPARE
(
import
.
url
(),
QString
(
"
org.w
eb
k
it"
));
QCOMPARE
(
import
.
url
(),
QString
(
"
QtW
eb
K
it"
));
QVERIFY
(
import
.
hasVersion
());
QCOMPARE
(
import
.
version
(),
QString
(
"1.0"
));
QVERIFY
(
import
.
hasAlias
());
...
...
@@ -835,12 +835,12 @@ void TestCore::testRewriterChangeImports()
//
// Add / Remove an import in the model
//
Import
webkitImport
=
Import
::
createLibraryImport
(
"
org.w
eb
k
it"
,
"1.0"
);
Import
webkitImport
=
Import
::
createLibraryImport
(
"
QtW
eb
K
it"
,
"1.0"
);
model
->
addImport
(
webkitImport
);
const
QLatin1String
qmlWithImport
(
"
\n
"
"import Qt 4.7
\n
"
"import
org.w
eb
k
it 1.0
\n
"
"import
QtW
eb
K
it 1.0
\n
"
"
\n
"
"Rectangle {}
\n
"
);
QCOMPARE
(
textEdit
.
toPlainText
(),
qmlWithImport
);
...
...
@@ -856,12 +856,12 @@ void TestCore::testRewriterChangeImports()
//
// Add / Remove an import in the model (with alias)
//
webkitImport
=
Import
::
createLibraryImport
(
"
org.w
eb
k
it"
,
"1.0"
,
"Web"
);
webkitImport
=
Import
::
createLibraryImport
(
"
QtW
eb
K
it"
,
"1.0"
,
"Web"
);
model
->
addImport
(
webkitImport
);
const
QLatin1String
qmlWithAliasImport
(
"
\n
"
"import Qt 4.7
\n
"
"import
org.w
eb
k
it 1.0 as Web
\n
"
"import
QtW
eb
K
it 1.0 as Web
\n
"
"
\n
"
"Rectangle {}
\n
"
);
QCOMPARE
(
textEdit
.
toPlainText
(),
qmlWithAliasImport
);
...
...
@@ -880,12 +880,12 @@ void TestCore::testRewriterChangeImports()
textEdit
.
setPlainText
(
qmlWithImport
);
QCOMPARE
(
model
->
imports
().
size
(),
2
);
QCOMPARE
(
model
->
imports
().
first
(),
Import
::
createLibraryImport
(
"Qt"
,
"4.7"
));
QCOMPARE
(
model
->
imports
().
last
(),
Import
::
createLibraryImport
(
"
org.w
eb
k
it"
,
"1.0"
));
QCOMPARE
(
model
->
imports
().
last
(),
Import
::
createLibraryImport
(
"
QtW
eb
K
it"
,
"1.0"
));
textEdit
.
setPlainText
(
qmlWithAliasImport
);
QCOMPARE
(
model
->
imports
().
size
(),
2
);
QCOMPARE
(
model
->
imports
().
first
(),
Import
::
createLibraryImport
(
"Qt"
,
"4.7"
));
QCOMPARE
(
model
->
imports
().
last
(),
Import
::
createLibraryImport
(
"
org.w
eb
k
it"
,
"1.0"
,
"Web"
));
QCOMPARE
(
model
->
imports
().
last
(),
Import
::
createLibraryImport
(
"
QtW
eb
K
it"
,
"1.0"
,
"Web"
));
textEdit
.
setPlainText
(
qmlString
);
QCOMPARE
(
model
->
imports
().
size
(),
1
);
...
...
@@ -3709,7 +3709,7 @@ void TestCore::testMetaInfo()
QVERIFY
(
model
->
metaInfo
().
hasNodeMetaInfo
(
"Qt/Item"
,
4
,
7
));
// test whether types from plugins are registered
QVERIFY
(
model
->
metaInfo
().
hasNodeMetaInfo
(
"
org.w
eb
k
it/WebView"
,
1
,
0
));
QVERIFY
(
model
->
metaInfo
().
hasNodeMetaInfo
(
"
QtW
eb
K
it/WebView"
,
1
,
0
));
// test whether non-qml type is registered
QVERIFY
(
model
->
metaInfo
().
hasNodeMetaInfo
(
"QGraphicsObject"
,
4
,
7
));
// Qt 4.7 namespace
...
...
tests/auto/qml/qmldesigner/data/fx/imports.qml
View file @
64839753
import
Qt
4.7
import
"
subitems
"
import
org
.
w
eb
k
it
1.0
as
Web
import
QtW
eb
K
it
1.0
as
Web
Rectangle
{
}
tests/manual/qml/testfiles/webview.qml
View file @
64839753
import
org
.
w
eb
k
it
1.0
import
QtW
eb
K
it
1.0
// Test loading of import libraries
WebView
{
...
...
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