summaryrefslogtreecommitdiffstats
path: root/examples/declarative/modelviews/webview/content/Mapping/Map.qml
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-22 12:45:42 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-22 12:45:42 (GMT)
commitdf874ce60baf0350b23717853107a9bcc65a5200 (patch)
treebecb8a7fd1fcb87a386fdb711f4e5aa7beee31b6 /examples/declarative/modelviews/webview/content/Mapping/Map.qml
parente39e53373754f45cf49eee5232598affec41b21c (diff)
parentc1bf731ddeb035045cda395e77327d9be4635bb3 (diff)
downloadQt-df874ce60baf0350b23717853107a9bcc65a5200.zip
Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.gz
Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'examples/declarative/modelviews/webview/content/Mapping/Map.qml')
-rw-r--r--examples/declarative/modelviews/webview/content/Mapping/Map.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
index 99f8479..c2489c5 100644
--- a/examples/declarative/modelviews/webview/content/Mapping/Map.qml
+++ b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
-import org.webkit 1.0
+import QtWebKit 1.0
Item {
id: page