212 files changed, 116 insertions, 139 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 06a2000..2bcd42a 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  browser embedded scroller webkit xmlpatterns qml
+SUBDIRS +=  webkitwidgets webkitqml
diff --git a/examples/qml/flickrview/flickrview.pro b/examples/qml/flickrview/flickrview.pro
deleted file mode 100644
index 09b2f69..0000000
--- a/examples/qml/flickrview/flickrview.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-
-DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"flickrview\\\"
-
-QT += quick qml webkitwidgets
-SOURCES += ../shared/main.cpp
-
-mac: CONFIG -= app_bundle
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/flickrview
-qml.files = flickrview.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/flickrview
-INSTALLS += target qml
diff --git a/examples/scroller/plot/plot.pro b/examples/scroller/plot/plot.pro
deleted file mode 100644
index f93da29..0000000
--- a/examples/scroller/plot/plot.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-HEADERS       = settingswidget.h \
-                plotwidget.h
-SOURCES       = settingswidget.cpp \
-                plotwidget.cpp \
-                main.cpp
-
-QT += webkitwidgets widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/plot
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plot.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/plot
-INSTALLS += target sources
diff --git a/examples/scroller/wheel/wheel.pro b/examples/scroller/wheel/wheel.pro
deleted file mode 100644
index f0e3a66..0000000
--- a/examples/scroller/wheel/wheel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-HEADERS       = wheelwidget.h
-SOURCES       = wheelwidget.cpp \
-                main.cpp
-
-QT += webkitwidgets widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/wheel
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wheel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/wheel
-INSTALLS += target sources
diff --git a/examples/webkit/domtraversal/domtraversal.pro b/examples/webkit/domtraversal/domtraversal.pro
deleted file mode 100644
index cd0811f..0000000
--- a/examples/webkit/domtraversal/domtraversal.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT       += webkitwidgets network widgets
-FORMS     = window.ui
-HEADERS   = window.h
-SOURCES   = main.cpp \
-            window.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/domtraversal
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/domtraversal
-INSTALLS += target sources
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
deleted file mode 100644
index 4d23d51..0000000
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT      +=  webkitwidgets network widgets
-HEADERS =   mainwindow.h
-SOURCES =   main.cpp \
-            mainwindow.cpp
-RESOURCES = jquery.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/fancybrowser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/fancybrowser
-INSTALLS += target sources
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro
deleted file mode 100644
index c02dadd..0000000
--- a/examples/webkit/framecapture/framecapture.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT      += webkitwidgets network widgets
-
-HEADERS = framecapture.h
-SOURCES = main.cpp \
-          framecapture.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/framecapture
-sources.files = $$SOURCES $$HEADERS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/framecapture
-INSTALLS += target sources
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
deleted file mode 100644
index 8a9eb0c..0000000
--- a/examples/webkit/previewer/previewer.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-QT      +=  webkitwidgets network widgets
-HEADERS =   previewer.h \
-            mainwindow.h
-SOURCES =   main.cpp \
-            previewer.cpp \
-            mainwindow.cpp
-FORMS   =   previewer.ui
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/previewer
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/previewer
-INSTALLS += target sources
diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro
deleted file mode 100644
index 97cefbc..0000000
--- a/examples/webkit/simpleselector/simpleselector.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT       += webkitwidgets network widgets
-FORMS     = window.ui
-HEADERS   = window.h
-SOURCES   = main.cpp \
-            window.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/simpleselector
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/simpleselector
-INSTALLS += target sources
diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro
deleted file mode 100644
index a721890..0000000
--- a/examples/webkit/webkit.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE =  subdirs
-SUBDIRS +=  domtraversal \
-            formextractor \
-            previewer \
-            fancybrowser \
-            simpleselector \
-            imageanalyzer \
-            framecapture \
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webkit.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit
-INSTALLS += target sources
diff --git a/examples/webkitqml/flickrview/flickrview.pro b/examples/webkitqml/flickrview/flickrview.pro
new file mode 100644
index 0000000..681dbd4
--- /dev/null
+++ b/examples/webkitqml/flickrview/flickrview.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"flickrview\\\"
+
+QT += quick qml
+SOURCES += ../shared/main.cpp
+
+mac: CONFIG -= app_bundle
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview
+qml.files = flickrview.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview
+INSTALLS += target qml
diff --git a/examples/qml/flickrview/flickrview.qml b/examples/webkitqml/flickrview/flickrview.qml
index 6592864..6592864 100644
--- a/examples/qml/flickrview/flickrview.qml
+++ b/examples/webkitqml/flickrview/flickrview.qml
diff --git a/examples/qml/flickrview/flickrview.qmlproject b/examples/webkitqml/flickrview/flickrview.qmlproject
index 7f47c02..7f47c02 100644
--- a/examples/qml/flickrview/flickrview.qmlproject
+++ b/examples/webkitqml/flickrview/flickrview.qmlproject
diff --git a/examples/qml/shared/Button.qml b/examples/webkitqml/shared/Button.qml
index 47dff90..47dff90 100644
--- a/examples/qml/shared/Button.qml
+++ b/examples/webkitqml/shared/Button.qml
diff --git a/examples/qml/shared/LoadIndicator.qml b/examples/webkitqml/shared/LoadIndicator.qml
index ff92e4a..ff92e4a 100644
--- a/examples/qml/shared/LoadIndicator.qml
+++ b/examples/webkitqml/shared/LoadIndicator.qml
diff --git a/examples/qml/shared/images/arrow.png b/examples/webkitqml/shared/images/arrow.png
index 1dcec44..1dcec44 100644
--- a/examples/qml/shared/images/arrow.png
+++ b/examples/webkitqml/shared/images/arrow.png
diff --git a/examples/qml/shared/images/busy.png b/examples/webkitqml/shared/images/busy.png
index 664c2b1..664c2b1 100644
--- a/examples/qml/shared/images/busy.png
+++ b/examples/webkitqml/shared/images/busy.png
diff --git a/examples/qml/shared/images/flickr.png b/examples/webkitqml/shared/images/flickr.png
index d0f0502..d0f0502 100644
--- a/examples/qml/shared/images/flickr.png
+++ b/examples/webkitqml/shared/images/flickr.png
diff --git a/examples/qml/shared/images/less.png b/examples/webkitqml/shared/images/less.png
index 136919b..136919b 100644
--- a/examples/qml/shared/images/less.png
+++ b/examples/webkitqml/shared/images/less.png
diff --git a/examples/qml/shared/images/more.png b/examples/webkitqml/shared/images/more.png
index fe7f87e..fe7f87e 100644
--- a/examples/qml/shared/images/more.png
+++ b/examples/webkitqml/shared/images/more.png
diff --git a/examples/qml/shared/main.cpp b/examples/webkitqml/shared/main.cpp
index 4be3b2a..4be3b2a 100644
--- a/examples/qml/shared/main.cpp
+++ b/examples/webkitqml/shared/main.cpp
diff --git a/examples/qml/shared/qmldir b/examples/webkitqml/shared/qmldir
index ffd9414..ffd9414 100644
--- a/examples/qml/shared/qmldir
+++ b/examples/webkitqml/shared/qmldir
diff --git a/examples/qml/shared/shared.pro b/examples/webkitqml/shared/shared.pro
index f40ebb0..06841c7 100644
--- a/examples/qml/shared/shared.pro
+++ b/examples/webkitqml/shared/shared.pro
@@ -7,5 +7,5 @@ qml.files = images \
             main.cpp \
             qmldir
 
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/shared
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/shared
 INSTALLS = qml
diff --git a/examples/qml/qml.pro b/examples/webkitqml/webkitqml.pro
index 9513539..9513539 100644
--- a/examples/qml/qml.pro
+++ b/examples/webkitqml/webkitqml.pro
diff --git a/examples/qml/youtubeview/content/YouTubeDialog.qml b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml
index 2d46474..2d46474 100644
--- a/examples/qml/youtubeview/content/YouTubeDialog.qml
+++ b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml
diff --git a/examples/qml/youtubeview/content/player.html b/examples/webkitqml/youtubeview/content/player.html
index 6f3a1e9..6f3a1e9 100644
--- a/examples/qml/youtubeview/content/player.html
+++ b/examples/webkitqml/youtubeview/content/player.html
diff --git a/examples/qml/youtubeview/youtubeview.pro b/examples/webkitqml/youtubeview/youtubeview.pro
index 8d79eab..30e1ef2 100644
--- a/examples/qml/youtubeview/youtubeview.pro
+++ b/examples/webkitqml/youtubeview/youtubeview.pro
@@ -2,14 +2,14 @@ TEMPLATE = app
 
 DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"youtubeview\\\"
 
-QT += quick qml webkitwidgets
+QT += quick qml
 SOURCES += ../shared/main.cpp
 
 mac: CONFIG -= app_bundle
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/youtubeview
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/youtubeview
 qml.files = youtubeview.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/youtubeview
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/youtubeview
 INSTALLS += target qml
 
 OTHER_FILES += \
diff --git a/examples/qml/youtubeview/youtubeview.qml b/examples/webkitqml/youtubeview/youtubeview.qml
index 4b1dacf..4b1dacf 100644
--- a/examples/qml/youtubeview/youtubeview.qml
+++ b/examples/webkitqml/youtubeview/youtubeview.qml
diff --git a/examples/qml/youtubeview/youtubeview.qmlproject b/examples/webkitqml/youtubeview/youtubeview.qmlproject
index 51f0a40..51f0a40 100644
--- a/examples/qml/youtubeview/youtubeview.qmlproject
+++ b/examples/webkitqml/youtubeview/youtubeview.qmlproject
diff --git a/examples/browser/Info_mac.plist b/examples/webkitwidgets/browser/Info_mac.plist
index a4731c2..a4731c2 100644
--- a/examples/browser/Info_mac.plist
+++ b/examples/webkitwidgets/browser/Info_mac.plist
diff --git a/examples/browser/addbookmarkdialog.ui b/examples/webkitwidgets/browser/addbookmarkdialog.ui
index 3460d7b..3460d7b 100644
--- a/examples/browser/addbookmarkdialog.ui
+++ b/examples/webkitwidgets/browser/addbookmarkdialog.ui
diff --git a/examples/browser/autosaver.cpp b/examples/webkitwidgets/browser/autosaver.cpp
index eefe1f7..eefe1f7 100644
--- a/examples/browser/autosaver.cpp
+++ b/examples/webkitwidgets/browser/autosaver.cpp
diff --git a/examples/browser/autosaver.h b/examples/webkitwidgets/browser/autosaver.h
index a171937..a171937 100644
--- a/examples/browser/autosaver.h
+++ b/examples/webkitwidgets/browser/autosaver.h
diff --git a/examples/browser/bookmarks.cpp b/examples/webkitwidgets/browser/bookmarks.cpp
index 4431e98..4431e98 100644
--- a/examples/browser/bookmarks.cpp
+++ b/examples/webkitwidgets/browser/bookmarks.cpp
diff --git a/examples/browser/bookmarks.h b/examples/webkitwidgets/browser/bookmarks.h
index f7a2fa1..f7a2fa1 100644
--- a/examples/browser/bookmarks.h
+++ b/examples/webkitwidgets/browser/bookmarks.h
diff --git a/examples/browser/bookmarks.ui b/examples/webkitwidgets/browser/bookmarks.ui
index c893e94..c893e94 100644
--- a/examples/browser/bookmarks.ui
+++ b/examples/webkitwidgets/browser/bookmarks.ui
diff --git a/examples/browser/browser.icns b/examples/webkitwidgets/browser/browser.icns
index f591ae4..f591ae4 100644
--- a/examples/browser/browser.icns
+++ b/examples/webkitwidgets/browser/browser.icns
diff --git a/examples/browser/browser.ico b/examples/webkitwidgets/browser/browser.ico
index 7f9be93..7f9be93 100644
--- a/examples/browser/browser.ico
+++ b/examples/webkitwidgets/browser/browser.ico
diff --git a/examples/browser/browser.pro b/examples/webkitwidgets/browser/browser.pro
index a5b486c..505d7bd 100644
--- a/examples/browser/browser.pro
+++ b/examples/webkitwidgets/browser/browser.pro
@@ -94,8 +94,8 @@ wince*: {
     DEPLOYMENT_PLUGIN += qjpeg qgif
 }
 
+EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc
+
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/browser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls data
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/browser
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/browser
+INSTALLS += target
diff --git a/examples/browser/browser.rc b/examples/webkitwidgets/browser/browser.rc
index 89a237c..89a237c 100644
--- a/examples/browser/browser.rc
+++ b/examples/webkitwidgets/browser/browser.rc
diff --git a/examples/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp
index f08c489..f08c489 100644
--- a/examples/browser/browserapplication.cpp
+++ b/examples/webkitwidgets/browser/browserapplication.cpp
diff --git a/examples/browser/browserapplication.h b/examples/webkitwidgets/browser/browserapplication.h
index d322607..d322607 100644
--- a/examples/browser/browserapplication.h
+++ b/examples/webkitwidgets/browser/browserapplication.h
diff --git a/examples/browser/browsermainwindow.cpp b/examples/webkitwidgets/browser/browsermainwindow.cpp
index 9561a3d..9561a3d 100644
--- a/examples/browser/browsermainwindow.cpp
+++ b/examples/webkitwidgets/browser/browsermainwindow.cpp
diff --git a/examples/browser/browsermainwindow.h b/examples/webkitwidgets/browser/browsermainwindow.h
index 8a93a14..8a93a14 100644
--- a/examples/browser/browsermainwindow.h
+++ b/examples/webkitwidgets/browser/browsermainwindow.h
diff --git a/examples/browser/chasewidget.cpp b/examples/webkitwidgets/browser/chasewidget.cpp
index 7ab98ee..7ab98ee 100644
--- a/examples/browser/chasewidget.cpp
+++ b/examples/webkitwidgets/browser/chasewidget.cpp
diff --git a/examples/browser/chasewidget.h b/examples/webkitwidgets/browser/chasewidget.h
index ba98c3b..ba98c3b 100644
--- a/examples/browser/chasewidget.h
+++ b/examples/webkitwidgets/browser/chasewidget.h
diff --git a/examples/browser/cookiejar.cpp b/examples/webkitwidgets/browser/cookiejar.cpp
index d2d72ef..d2d72ef 100644
--- a/examples/browser/cookiejar.cpp
+++ b/examples/webkitwidgets/browser/cookiejar.cpp
diff --git a/examples/browser/cookiejar.h b/examples/webkitwidgets/browser/cookiejar.h
index 3029c38..3029c38 100644
--- a/examples/browser/cookiejar.h
+++ b/examples/webkitwidgets/browser/cookiejar.h
diff --git a/examples/browser/cookies.ui b/examples/webkitwidgets/browser/cookies.ui
index c4bccc5..c4bccc5 100644
--- a/examples/browser/cookies.ui
+++ b/examples/webkitwidgets/browser/cookies.ui
diff --git a/examples/browser/cookiesexceptions.ui b/examples/webkitwidgets/browser/cookiesexceptions.ui
index 3d9ef62..3d9ef62 100644
--- a/examples/browser/cookiesexceptions.ui
+++ b/examples/webkitwidgets/browser/cookiesexceptions.ui
diff --git a/examples/browser/data/addtab.png b/examples/webkitwidgets/browser/data/addtab.png
index 20928fb..20928fb 100644
--- a/examples/browser/data/addtab.png
+++ b/examples/webkitwidgets/browser/data/addtab.png
diff --git a/examples/browser/data/browser.svg b/examples/webkitwidgets/browser/data/browser.svg
index 9908aed..9908aed 100644
--- a/examples/browser/data/browser.svg
+++ b/examples/webkitwidgets/browser/data/browser.svg
diff --git a/examples/browser/data/closetab.png b/examples/webkitwidgets/browser/data/closetab.png
index ab9d669..ab9d669 100644
--- a/examples/browser/data/closetab.png
+++ b/examples/webkitwidgets/browser/data/closetab.png
diff --git a/examples/browser/data/data.qrc b/examples/webkitwidgets/browser/data/data.qrc
index c7d0294..c7d0294 100644
--- a/examples/browser/data/data.qrc
+++ b/examples/webkitwidgets/browser/data/data.qrc
diff --git a/examples/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel
index 7a95e36..7a95e36 100644
--- a/examples/browser/data/defaultbookmarks.xbel
+++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel
diff --git a/examples/browser/data/defaulticon.png b/examples/webkitwidgets/browser/data/defaulticon.png
index 01a0920..01a0920 100644
--- a/examples/browser/data/defaulticon.png
+++ b/examples/webkitwidgets/browser/data/defaulticon.png
diff --git a/examples/browser/data/history.png b/examples/webkitwidgets/browser/data/history.png
index 552a1cb..552a1cb 100644
--- a/examples/browser/data/history.png
+++ b/examples/webkitwidgets/browser/data/history.png
diff --git a/examples/browser/data/loading.gif b/examples/webkitwidgets/browser/data/loading.gif
index c1545eb..c1545eb 100644
--- a/examples/browser/data/loading.gif
+++ b/examples/webkitwidgets/browser/data/loading.gif
diff --git a/examples/browser/downloaditem.ui b/examples/webkitwidgets/browser/downloaditem.ui
index 4a0a0fd..4a0a0fd 100644
--- a/examples/browser/downloaditem.ui
+++ b/examples/webkitwidgets/browser/downloaditem.ui
diff --git a/examples/browser/downloadmanager.cpp b/examples/webkitwidgets/browser/downloadmanager.cpp
index 93c9cc4..93c9cc4 100644
--- a/examples/browser/downloadmanager.cpp
+++ b/examples/webkitwidgets/browser/downloadmanager.cpp
diff --git a/examples/browser/downloadmanager.h b/examples/webkitwidgets/browser/downloadmanager.h
index 5decb3a..5decb3a 100644
--- a/examples/browser/downloadmanager.h
+++ b/examples/webkitwidgets/browser/downloadmanager.h
diff --git a/examples/browser/downloads.ui b/examples/webkitwidgets/browser/downloads.ui
index a2e2569..a2e2569 100644
--- a/examples/browser/downloads.ui
+++ b/examples/webkitwidgets/browser/downloads.ui
diff --git a/examples/browser/edittableview.cpp b/examples/webkitwidgets/browser/edittableview.cpp
index 5415967..5415967 100644
--- a/examples/browser/edittableview.cpp
+++ b/examples/webkitwidgets/browser/edittableview.cpp
diff --git a/examples/browser/edittableview.h b/examples/webkitwidgets/browser/edittableview.h
index fa465ea..fa465ea 100644
--- a/examples/browser/edittableview.h
+++ b/examples/webkitwidgets/browser/edittableview.h
diff --git a/examples/browser/edittreeview.cpp b/examples/webkitwidgets/browser/edittreeview.cpp
index dfe27ad..dfe27ad 100644
--- a/examples/browser/edittreeview.cpp
+++ b/examples/webkitwidgets/browser/edittreeview.cpp
diff --git a/examples/browser/edittreeview.h b/examples/webkitwidgets/browser/edittreeview.h
index 166aaad..166aaad 100644
--- a/examples/browser/edittreeview.h
+++ b/examples/webkitwidgets/browser/edittreeview.h
diff --git a/examples/browser/history.cpp b/examples/webkitwidgets/browser/history.cpp
index 11a42f2..11a42f2 100644
--- a/examples/browser/history.cpp
+++ b/examples/webkitwidgets/browser/history.cpp
diff --git a/examples/browser/history.h b/examples/webkitwidgets/browser/history.h
index 0add405..0add405 100644
--- a/examples/browser/history.h
+++ b/examples/webkitwidgets/browser/history.h
diff --git a/examples/browser/history.ui b/examples/webkitwidgets/browser/history.ui
index 0944940..0944940 100644
--- a/examples/browser/history.ui
+++ b/examples/webkitwidgets/browser/history.ui
diff --git a/examples/browser/htmls/htmls.qrc b/examples/webkitwidgets/browser/htmls/htmls.qrc
index 03b256c..03b256c 100644
--- a/examples/browser/htmls/htmls.qrc
+++ b/examples/webkitwidgets/browser/htmls/htmls.qrc
diff --git a/examples/browser/htmls/notfound.html b/examples/webkitwidgets/browser/htmls/notfound.html
index e89845a..e89845a 100644
--- a/examples/browser/htmls/notfound.html
+++ b/examples/webkitwidgets/browser/htmls/notfound.html
diff --git a/examples/browser/main.cpp b/examples/webkitwidgets/browser/main.cpp
index 1480c66..1480c66 100644
--- a/examples/browser/main.cpp
+++ b/examples/webkitwidgets/browser/main.cpp
diff --git a/examples/browser/modelmenu.cpp b/examples/webkitwidgets/browser/modelmenu.cpp
index 8226fb8..8226fb8 100644
--- a/examples/browser/modelmenu.cpp
+++ b/examples/webkitwidgets/browser/modelmenu.cpp
diff --git a/examples/browser/modelmenu.h b/examples/webkitwidgets/browser/modelmenu.h
index e28861d..e28861d 100644
--- a/examples/browser/modelmenu.h
+++ b/examples/webkitwidgets/browser/modelmenu.h
diff --git a/examples/browser/networkaccessmanager.cpp b/examples/webkitwidgets/browser/networkaccessmanager.cpp
index b4d635f..b4d635f 100644
--- a/examples/browser/networkaccessmanager.cpp
+++ b/examples/webkitwidgets/browser/networkaccessmanager.cpp
diff --git a/examples/browser/networkaccessmanager.h b/examples/webkitwidgets/browser/networkaccessmanager.h
index 9dde549..9dde549 100644
--- a/examples/browser/networkaccessmanager.h
+++ b/examples/webkitwidgets/browser/networkaccessmanager.h
diff --git a/examples/browser/passworddialog.ui b/examples/webkitwidgets/browser/passworddialog.ui
index 7c16658..7c16658 100644
--- a/examples/browser/passworddialog.ui
+++ b/examples/webkitwidgets/browser/passworddialog.ui
diff --git a/examples/browser/proxy.ui b/examples/webkitwidgets/browser/proxy.ui
index 62a8be6..62a8be6 100644
--- a/examples/browser/proxy.ui
+++ b/examples/webkitwidgets/browser/proxy.ui
diff --git a/examples/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp
index 06f14a4..06f14a4 100644
--- a/examples/browser/searchlineedit.cpp
+++ b/examples/webkitwidgets/browser/searchlineedit.cpp
diff --git a/examples/browser/searchlineedit.h b/examples/webkitwidgets/browser/searchlineedit.h
index 5e50bb1..5e50bb1 100644
--- a/examples/browser/searchlineedit.h
+++ b/examples/webkitwidgets/browser/searchlineedit.h
diff --git a/examples/browser/settings.cpp b/examples/webkitwidgets/browser/settings.cpp
index 501c890..501c890 100644
--- a/examples/browser/settings.cpp
+++ b/examples/webkitwidgets/browser/settings.cpp
diff --git a/examples/browser/settings.h b/examples/webkitwidgets/browser/settings.h
index 93719fe..93719fe 100644
--- a/examples/browser/settings.h
+++ b/examples/webkitwidgets/browser/settings.h
diff --git a/examples/browser/settings.ui b/examples/webkitwidgets/browser/settings.ui
index 3491ce0..3491ce0 100644
--- a/examples/browser/settings.ui
+++ b/examples/webkitwidgets/browser/settings.ui
diff --git a/examples/browser/squeezelabel.cpp b/examples/webkitwidgets/browser/squeezelabel.cpp
index ff133eb..ff133eb 100644
--- a/examples/browser/squeezelabel.cpp
+++ b/examples/webkitwidgets/browser/squeezelabel.cpp
diff --git a/examples/browser/squeezelabel.h b/examples/webkitwidgets/browser/squeezelabel.h
index f3407c2..f3407c2 100644
--- a/examples/browser/squeezelabel.h
+++ b/examples/webkitwidgets/browser/squeezelabel.h
diff --git a/examples/browser/tabwidget.cpp b/examples/webkitwidgets/browser/tabwidget.cpp
index b706959..b706959 100644
--- a/examples/browser/tabwidget.cpp
+++ b/examples/webkitwidgets/browser/tabwidget.cpp
diff --git a/examples/browser/tabwidget.h b/examples/webkitwidgets/browser/tabwidget.h
index 29b518b..29b518b 100644
--- a/examples/browser/tabwidget.h
+++ b/examples/webkitwidgets/browser/tabwidget.h
diff --git a/examples/browser/toolbarsearch.cpp b/examples/webkitwidgets/browser/toolbarsearch.cpp
index 33bc51c..33bc51c 100644
--- a/examples/browser/toolbarsearch.cpp
+++ b/examples/webkitwidgets/browser/toolbarsearch.cpp
diff --git a/examples/browser/toolbarsearch.h b/examples/webkitwidgets/browser/toolbarsearch.h
index bbf2973..bbf2973 100644
--- a/examples/browser/toolbarsearch.h
+++ b/examples/webkitwidgets/browser/toolbarsearch.h
diff --git a/examples/browser/urllineedit.cpp b/examples/webkitwidgets/browser/urllineedit.cpp
index 1fdc73d..1fdc73d 100644
--- a/examples/browser/urllineedit.cpp
+++ b/examples/webkitwidgets/browser/urllineedit.cpp
diff --git a/examples/browser/urllineedit.h b/examples/webkitwidgets/browser/urllineedit.h
index f9716fd..f9716fd 100644
--- a/examples/browser/urllineedit.h
+++ b/examples/webkitwidgets/browser/urllineedit.h
diff --git a/examples/browser/webview.cpp b/examples/webkitwidgets/browser/webview.cpp
index 41c6558..41c6558 100644
--- a/examples/browser/webview.cpp
+++ b/examples/webkitwidgets/browser/webview.cpp
diff --git a/examples/browser/webview.h b/examples/webkitwidgets/browser/webview.h
index c48d141..c48d141 100644
--- a/examples/browser/webview.h
+++ b/examples/webkitwidgets/browser/webview.h
diff --git a/examples/browser/xbel.cpp b/examples/webkitwidgets/browser/xbel.cpp
index e52afe1..e52afe1 100644
--- a/examples/browser/xbel.cpp
+++ b/examples/webkitwidgets/browser/xbel.cpp
diff --git a/examples/browser/xbel.h b/examples/webkitwidgets/browser/xbel.h
index a919def..a919def 100644
--- a/examples/browser/xbel.h
+++ b/examples/webkitwidgets/browser/xbel.h
diff --git a/examples/webkit/domtraversal/doc/images/webkit-domtraversal.png b/examples/webkitwidgets/domtraversal/doc/images/webkit-domtraversal.png
index 8b6f34a..8b6f34a 100644
--- a/examples/webkit/domtraversal/doc/images/webkit-domtraversal.png
+++ b/examples/webkitwidgets/domtraversal/doc/images/webkit-domtraversal.png
diff --git a/examples/webkit/domtraversal/doc/src/domtraversal.qdoc b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
index 52764f3..52764f3 100644
--- a/examples/webkit/domtraversal/doc/src/domtraversal.qdoc
+++ b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
diff --git a/examples/webkitwidgets/domtraversal/domtraversal.pro b/examples/webkitwidgets/domtraversal/domtraversal.pro
new file mode 100644
index 0000000..8c53258
--- /dev/null
+++ b/examples/webkitwidgets/domtraversal/domtraversal.pro
@@ -0,0 +1,9 @@
+QT       += webkitwidgets network widgets
+FORMS     = window.ui
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/domtraversal
+INSTALLS += target
diff --git a/examples/webkit/domtraversal/main.cpp b/examples/webkitwidgets/domtraversal/main.cpp
index d105e47..d105e47 100644
--- a/examples/webkit/domtraversal/main.cpp
+++ b/examples/webkitwidgets/domtraversal/main.cpp
diff --git a/examples/webkit/domtraversal/window.cpp b/examples/webkitwidgets/domtraversal/window.cpp
index f96b9be..f96b9be 100644
--- a/examples/webkit/domtraversal/window.cpp
+++ b/examples/webkitwidgets/domtraversal/window.cpp
diff --git a/examples/webkit/domtraversal/window.h b/examples/webkitwidgets/domtraversal/window.h
index f9ce2f7..f9ce2f7 100644
--- a/examples/webkit/domtraversal/window.h
+++ b/examples/webkitwidgets/domtraversal/window.h
diff --git a/examples/webkit/domtraversal/window.ui b/examples/webkitwidgets/domtraversal/window.ui
index e245aa6..e245aa6 100644
--- a/examples/webkit/domtraversal/window.ui
+++ b/examples/webkitwidgets/domtraversal/window.ui
diff --git a/examples/embedded/anomaly/README.TXT b/examples/webkitwidgets/embedded/anomaly/README.TXT
index e69de29..e69de29 100644
--- a/examples/embedded/anomaly/README.TXT
+++ b/examples/webkitwidgets/embedded/anomaly/README.TXT
diff --git a/examples/embedded/anomaly/anomaly.pro b/examples/webkitwidgets/embedded/anomaly/anomaly.pro
index 00253f7..ddb20f2 100644
--- a/examples/embedded/anomaly/anomaly.pro
+++ b/examples/webkitwidgets/embedded/anomaly/anomaly.pro
@@ -24,7 +24,5 @@ SOURCES += src/Main.cpp \
     src/webview.cpp
 RESOURCES += src/anomaly.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/embedded/anomaly
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro src/images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/embedded/anomaly
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/embedded/anomaly
+INSTALLS += target
diff --git a/examples/embedded/anomaly/src/AddressBar.cpp b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.cpp
index dfb4043..dfb4043 100644
--- a/examples/embedded/anomaly/src/AddressBar.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.cpp
diff --git a/examples/embedded/anomaly/src/AddressBar.h b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.h
index ae9010d..ae9010d 100644
--- a/examples/embedded/anomaly/src/AddressBar.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.h
diff --git a/examples/embedded/anomaly/src/BookmarksView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
index 63e48e2..63e48e2 100644
--- a/examples/embedded/anomaly/src/BookmarksView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
diff --git a/examples/embedded/anomaly/src/BookmarksView.h b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.h
index 4d68a6c..4d68a6c 100644
--- a/examples/embedded/anomaly/src/BookmarksView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.h
diff --git a/examples/embedded/anomaly/src/BrowserView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.cpp
index 46f898d..46f898d 100644
--- a/examples/embedded/anomaly/src/BrowserView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.cpp
diff --git a/examples/embedded/anomaly/src/BrowserView.h b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.h
index 51f5897..51f5897 100644
--- a/examples/embedded/anomaly/src/BrowserView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.h
diff --git a/examples/embedded/anomaly/src/BrowserWindow.cpp b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.cpp
index c380766..c380766 100644
--- a/examples/embedded/anomaly/src/BrowserWindow.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.cpp
diff --git a/examples/embedded/anomaly/src/BrowserWindow.h b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.h
index eb97f77..eb97f77 100644
--- a/examples/embedded/anomaly/src/BrowserWindow.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.h
diff --git a/examples/embedded/anomaly/src/ControlStrip.cpp b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.cpp
index c5f2aee..c5f2aee 100644
--- a/examples/embedded/anomaly/src/ControlStrip.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.cpp
diff --git a/examples/embedded/anomaly/src/ControlStrip.h b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.h
index 8c37036..8c37036 100644
--- a/examples/embedded/anomaly/src/ControlStrip.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.h
diff --git a/examples/embedded/anomaly/src/HomeView.cpp b/examples/webkitwidgets/embedded/anomaly/src/HomeView.cpp
index 9bc0fee..9bc0fee 100644
--- a/examples/embedded/anomaly/src/HomeView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/HomeView.cpp
diff --git a/examples/embedded/anomaly/src/HomeView.h b/examples/webkitwidgets/embedded/anomaly/src/HomeView.h
index bac25ae..bac25ae 100644
--- a/examples/embedded/anomaly/src/HomeView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/HomeView.h
diff --git a/examples/embedded/anomaly/src/Main.cpp b/examples/webkitwidgets/embedded/anomaly/src/Main.cpp
index 958738d..958738d 100644
--- a/examples/embedded/anomaly/src/Main.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/Main.cpp
diff --git a/examples/embedded/anomaly/src/TitleBar.cpp b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.cpp
index c6a67e8..c6a67e8 100644
--- a/examples/embedded/anomaly/src/TitleBar.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.cpp
diff --git a/examples/embedded/anomaly/src/TitleBar.h b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.h
index 9747f97..9747f97 100644
--- a/examples/embedded/anomaly/src/TitleBar.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.h
diff --git a/examples/embedded/anomaly/src/ZoomStrip.cpp b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.cpp
index 5b0b15e..5b0b15e 100644
--- a/examples/embedded/anomaly/src/ZoomStrip.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.cpp
diff --git a/examples/embedded/anomaly/src/ZoomStrip.h b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.h
index a30b6a3..a30b6a3 100644
--- a/examples/embedded/anomaly/src/ZoomStrip.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.h
diff --git a/examples/embedded/anomaly/src/anomaly.qrc b/examples/webkitwidgets/embedded/anomaly/src/anomaly.qrc
index d8ea630..d8ea630 100644
--- a/examples/embedded/anomaly/src/anomaly.qrc
+++ b/examples/webkitwidgets/embedded/anomaly/src/anomaly.qrc
diff --git a/examples/embedded/anomaly/src/flickcharm.cpp b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.cpp
index 4e30ee8..4e30ee8 100644
--- a/examples/embedded/anomaly/src/flickcharm.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.cpp
diff --git a/examples/embedded/anomaly/src/flickcharm.h b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.h
index 8042ecd..8042ecd 100644
--- a/examples/embedded/anomaly/src/flickcharm.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.h
diff --git a/examples/embedded/anomaly/src/images/button-close.png b/examples/webkitwidgets/embedded/anomaly/src/images/button-close.png
index 7a7b048..7a7b048 100644
--- a/examples/embedded/anomaly/src/images/button-close.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/button-close.png
diff --git a/examples/embedded/anomaly/src/images/edit-find.png b/examples/webkitwidgets/embedded/anomaly/src/images/edit-find.png
index b84b1e2..b84b1e2 100644
--- a/examples/embedded/anomaly/src/images/edit-find.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/edit-find.png
diff --git a/examples/embedded/anomaly/src/images/go-next.png b/examples/webkitwidgets/embedded/anomaly/src/images/go-next.png
index ed89a36..ed89a36 100644
--- a/examples/embedded/anomaly/src/images/go-next.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/go-next.png
diff --git a/examples/embedded/anomaly/src/images/go-previous.png b/examples/webkitwidgets/embedded/anomaly/src/images/go-previous.png
index 44e803d..44e803d 100644
--- a/examples/embedded/anomaly/src/images/go-previous.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/go-previous.png
diff --git a/examples/embedded/anomaly/src/images/list-add.png b/examples/webkitwidgets/embedded/anomaly/src/images/list-add.png
index 2acdd8f..2acdd8f 100644
--- a/examples/embedded/anomaly/src/images/list-add.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/list-add.png
diff --git a/examples/embedded/anomaly/src/images/list-remove.png b/examples/webkitwidgets/embedded/anomaly/src/images/list-remove.png
index c5524f7..c5524f7 100644
--- a/examples/embedded/anomaly/src/images/list-remove.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/list-remove.png
diff --git a/examples/embedded/anomaly/src/webview.cpp b/examples/webkitwidgets/embedded/anomaly/src/webview.cpp
index 03d9ced..03d9ced 100644
--- a/examples/embedded/anomaly/src/webview.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/webview.cpp
diff --git a/examples/embedded/anomaly/src/webview.h b/examples/webkitwidgets/embedded/anomaly/src/webview.h
index d7d4193..d7d4193 100644
--- a/examples/embedded/anomaly/src/webview.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/webview.h
diff --git a/examples/embedded/embedded.pro b/examples/webkitwidgets/embedded/embedded.pro
index 9c61eec..9c61eec 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/webkitwidgets/embedded/embedded.pro
diff --git a/examples/webkit/fancybrowser/doc/images/fancybrowser-example.png b/examples/webkitwidgets/fancybrowser/doc/images/fancybrowser-example.png
index 717ac9d..717ac9d 100644
--- a/examples/webkit/fancybrowser/doc/images/fancybrowser-example.png
+++ b/examples/webkitwidgets/fancybrowser/doc/images/fancybrowser-example.png
diff --git a/examples/webkit/fancybrowser/doc/src/fancybrowser.qdoc b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
index 7734478..7734478 100644
--- a/examples/webkit/fancybrowser/doc/src/fancybrowser.qdoc
+++ b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
diff --git a/examples/webkitwidgets/fancybrowser/fancybrowser.pro b/examples/webkitwidgets/fancybrowser/fancybrowser.pro
new file mode 100644
index 0000000..81938ec
--- /dev/null
+++ b/examples/webkitwidgets/fancybrowser/fancybrowser.pro
@@ -0,0 +1,9 @@
+QT      +=  webkitwidgets network widgets
+HEADERS =   mainwindow.h
+SOURCES =   main.cpp \
+            mainwindow.cpp
+RESOURCES = jquery.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/fancybrowser
+INSTALLS += target
diff --git a/examples/webkit/fancybrowser/jquery.min.js b/examples/webkitwidgets/fancybrowser/jquery.min.js
index b1ae21d..b1ae21d 100644
--- a/examples/webkit/fancybrowser/jquery.min.js
+++ b/examples/webkitwidgets/fancybrowser/jquery.min.js
diff --git a/examples/webkit/fancybrowser/jquery.qrc b/examples/webkitwidgets/fancybrowser/jquery.qrc
index 1022d68..1022d68 100644
--- a/examples/webkit/fancybrowser/jquery.qrc
+++ b/examples/webkitwidgets/fancybrowser/jquery.qrc
diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkitwidgets/fancybrowser/main.cpp
index f671a7d..f671a7d 100644
--- a/examples/webkit/fancybrowser/main.cpp
+++ b/examples/webkitwidgets/fancybrowser/main.cpp
diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
index da6b070..da6b070 100644
--- a/examples/webkit/fancybrowser/mainwindow.cpp
+++ b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkitwidgets/fancybrowser/mainwindow.h
index fabb6a0..fabb6a0 100644
--- a/examples/webkit/fancybrowser/mainwindow.h
+++ b/examples/webkitwidgets/fancybrowser/mainwindow.h
diff --git a/examples/webkit/formextractor/doc/images/formextractor-example.png b/examples/webkitwidgets/formextractor/doc/images/formextractor-example.png
index 155cdaa..155cdaa 100644
--- a/examples/webkit/formextractor/doc/images/formextractor-example.png
+++ b/examples/webkitwidgets/formextractor/doc/images/formextractor-example.png
diff --git a/examples/webkit/formextractor/doc/src/formextractor.qdoc b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
index 5b27054..5b27054 100644
--- a/examples/webkit/formextractor/doc/src/formextractor.qdoc
+++ b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
diff --git a/examples/webkit/formextractor/form.html b/examples/webkitwidgets/formextractor/form.html
index 6b0bbde..6b0bbde 100755
--- a/examples/webkit/formextractor/form.html
+++ b/examples/webkitwidgets/formextractor/form.html
diff --git a/examples/webkit/formextractor/formextractor.cpp b/examples/webkitwidgets/formextractor/formextractor.cpp
index 28f6abf..28f6abf 100644
--- a/examples/webkit/formextractor/formextractor.cpp
+++ b/examples/webkitwidgets/formextractor/formextractor.cpp
diff --git a/examples/webkit/formextractor/formextractor.h b/examples/webkitwidgets/formextractor/formextractor.h
index ff62f8c..ff62f8c 100644
--- a/examples/webkit/formextractor/formextractor.h
+++ b/examples/webkitwidgets/formextractor/formextractor.h
diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkitwidgets/formextractor/formextractor.pro
index ce86aa8..050ac89 100644
--- a/examples/webkit/formextractor/formextractor.pro
+++ b/examples/webkitwidgets/formextractor/formextractor.pro
@@ -10,7 +10,5 @@ FORMS        += formextractor.ui
 RESOURCES    += formextractor.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/formextractor
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro form.html images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/formextractor
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/formextractor
+INSTALLS += target
diff --git a/examples/webkit/formextractor/formextractor.qrc b/examples/webkitwidgets/formextractor/formextractor.qrc
index e35f4b2..e35f4b2 100644
--- a/examples/webkit/formextractor/formextractor.qrc
+++ b/examples/webkitwidgets/formextractor/formextractor.qrc
diff --git a/examples/webkit/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui
index 5c4afec..5c4afec 100644
--- a/examples/webkit/formextractor/formextractor.ui
+++ b/examples/webkitwidgets/formextractor/formextractor.ui
diff --git a/examples/webkit/formextractor/main.cpp b/examples/webkitwidgets/formextractor/main.cpp
index 8dae190..8dae190 100644
--- a/examples/webkit/formextractor/main.cpp
+++ b/examples/webkitwidgets/formextractor/main.cpp
diff --git a/examples/webkit/formextractor/mainwindow.cpp b/examples/webkitwidgets/formextractor/mainwindow.cpp
index 9e52ce8..9e52ce8 100644
--- a/examples/webkit/formextractor/mainwindow.cpp
+++ b/examples/webkitwidgets/formextractor/mainwindow.cpp
diff --git a/examples/webkit/formextractor/mainwindow.h b/examples/webkitwidgets/formextractor/mainwindow.h
index cd4e8a6..cd4e8a6 100644
--- a/examples/webkit/formextractor/mainwindow.h
+++ b/examples/webkitwidgets/formextractor/mainwindow.h
diff --git a/examples/webkit/framecapture/framecapture.cpp b/examples/webkitwidgets/framecapture/framecapture.cpp
index 0b3441c..0b3441c 100644
--- a/examples/webkit/framecapture/framecapture.cpp
+++ b/examples/webkitwidgets/framecapture/framecapture.cpp
diff --git a/examples/webkit/framecapture/framecapture.h b/examples/webkitwidgets/framecapture/framecapture.h
index 6f49ffb..6f49ffb 100644
--- a/examples/webkit/framecapture/framecapture.h
+++ b/examples/webkitwidgets/framecapture/framecapture.h
diff --git a/examples/webkitwidgets/framecapture/framecapture.pro b/examples/webkitwidgets/framecapture/framecapture.pro
new file mode 100644
index 0000000..bdd1b4e
--- /dev/null
+++ b/examples/webkitwidgets/framecapture/framecapture.pro
@@ -0,0 +1,9 @@
+QT      += webkitwidgets network widgets
+
+HEADERS = framecapture.h
+SOURCES = main.cpp \
+          framecapture.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/framecapture
+INSTALLS += target
diff --git a/examples/webkit/framecapture/main.cpp b/examples/webkitwidgets/framecapture/main.cpp
index e900313..e900313 100644
--- a/examples/webkit/framecapture/main.cpp
+++ b/examples/webkitwidgets/framecapture/main.cpp
diff --git a/examples/webkit/imageanalyzer/README b/examples/webkitwidgets/imageanalyzer/README
index 9415b57..9415b57 100644
--- a/examples/webkit/imageanalyzer/README
+++ b/examples/webkitwidgets/imageanalyzer/README
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.cpp b/examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp
index 973411c..973411c 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.cpp
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.h b/examples/webkitwidgets/imageanalyzer/imageanalyzer.h
index 1b0948c..1b0948c 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.h
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.h
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.pro b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro
index 3efc656..442a05f 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.pro
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro
@@ -9,6 +9,6 @@ QT += network webkitwidgets widgets concurrent
 
 RESOURCES = resources/imageanalyzer.qrc
 
-OTHER_FILES += html/index.html README ../webkit-bridge-tutorial.qdoc outline.txt
+EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt
 
 
diff --git a/examples/webkit/imageanalyzer/main.cpp b/examples/webkitwidgets/imageanalyzer/main.cpp
index 3601264..3601264 100644
--- a/examples/webkit/imageanalyzer/main.cpp
+++ b/examples/webkitwidgets/imageanalyzer/main.cpp
diff --git a/examples/webkit/imageanalyzer/mainwindow.cpp b/examples/webkitwidgets/imageanalyzer/mainwindow.cpp
index 71193e7..71193e7 100644
--- a/examples/webkit/imageanalyzer/mainwindow.cpp
+++ b/examples/webkitwidgets/imageanalyzer/mainwindow.cpp
diff --git a/examples/webkit/imageanalyzer/mainwindow.h b/examples/webkitwidgets/imageanalyzer/mainwindow.h
index 6fcd74a..6fcd74a 100644
--- a/examples/webkit/imageanalyzer/mainwindow.h
+++ b/examples/webkitwidgets/imageanalyzer/mainwindow.h
diff --git a/examples/webkit/imageanalyzer/resources/imageanalyzer.qrc b/examples/webkitwidgets/imageanalyzer/resources/imageanalyzer.qrc
index fe9a5df..fe9a5df 100644
--- a/examples/webkit/imageanalyzer/resources/imageanalyzer.qrc
+++ b/examples/webkitwidgets/imageanalyzer/resources/imageanalyzer.qrc
diff --git a/examples/webkit/imageanalyzer/resources/images/README b/examples/webkitwidgets/imageanalyzer/resources/images/README
index 176a1da..176a1da 100644
--- a/examples/webkit/imageanalyzer/resources/images/README
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/README
diff --git a/examples/webkit/imageanalyzer/resources/images/bellaCoola.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/bellaCoola.jpg
index f90ed54..f90ed54 100644
--- a/examples/webkit/imageanalyzer/resources/images/bellaCoola.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/bellaCoola.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/flower.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/flower.jpg
index 6b7f6be..6b7f6be 100644
--- a/examples/webkit/imageanalyzer/resources/images/flower.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/flower.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/mtRainier.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/mtRainier.jpg
index d09a3f2..d09a3f2 100644
--- a/examples/webkit/imageanalyzer/resources/images/mtRainier.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/mtRainier.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/seaShell.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/seaShell.jpg
index c5005a9..c5005a9 100644
--- a/examples/webkit/imageanalyzer/resources/images/seaShell.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/seaShell.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/trees.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/trees.jpg
index 083b26d..083b26d 100644
--- a/examples/webkit/imageanalyzer/resources/images/trees.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/trees.jpg
diff --git a/examples/webkit/imageanalyzer/resources/index.html b/examples/webkitwidgets/imageanalyzer/resources/index.html
index 6532951..6532951 100644
--- a/examples/webkit/imageanalyzer/resources/index.html
+++ b/examples/webkitwidgets/imageanalyzer/resources/index.html
diff --git a/examples/webkit/previewer/doc/images/previewer-example.png b/examples/webkitwidgets/previewer/doc/images/previewer-example.png
index d930250..d930250 100644
--- a/examples/webkit/previewer/doc/images/previewer-example.png
+++ b/examples/webkitwidgets/previewer/doc/images/previewer-example.png
diff --git a/examples/webkit/previewer/doc/images/previewer-ui.png b/examples/webkitwidgets/previewer/doc/images/previewer-ui.png
index c92d136..c92d136 100644
--- a/examples/webkit/previewer/doc/images/previewer-ui.png
+++ b/examples/webkitwidgets/previewer/doc/images/previewer-ui.png
diff --git a/examples/webkit/previewer/doc/src/previewer.qdoc b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
index 5a3bdc3..5a3bdc3 100644
--- a/examples/webkit/previewer/doc/src/previewer.qdoc
+++ b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
diff --git a/examples/webkit/previewer/main.cpp b/examples/webkitwidgets/previewer/main.cpp
index f08fa58..f08fa58 100644
--- a/examples/webkit/previewer/main.cpp
+++ b/examples/webkitwidgets/previewer/main.cpp
diff --git a/examples/webkit/previewer/mainwindow.cpp b/examples/webkitwidgets/previewer/mainwindow.cpp
index e0dc069..e0dc069 100644
--- a/examples/webkit/previewer/mainwindow.cpp
+++ b/examples/webkitwidgets/previewer/mainwindow.cpp
diff --git a/examples/webkit/previewer/mainwindow.h b/examples/webkitwidgets/previewer/mainwindow.h
index 9fd9deb..9fd9deb 100644
--- a/examples/webkit/previewer/mainwindow.h
+++ b/examples/webkitwidgets/previewer/mainwindow.h
diff --git a/examples/webkit/previewer/previewer.cpp b/examples/webkitwidgets/previewer/previewer.cpp
index dfd6dd4..dfd6dd4 100644
--- a/examples/webkit/previewer/previewer.cpp
+++ b/examples/webkitwidgets/previewer/previewer.cpp
diff --git a/examples/webkit/previewer/previewer.h b/examples/webkitwidgets/previewer/previewer.h
index 5692e3b..5692e3b 100644
--- a/examples/webkit/previewer/previewer.h
+++ b/examples/webkitwidgets/previewer/previewer.h
diff --git a/examples/webkitwidgets/previewer/previewer.pro b/examples/webkitwidgets/previewer/previewer.pro
new file mode 100644
index 0000000..8bca084
--- /dev/null
+++ b/examples/webkitwidgets/previewer/previewer.pro
@@ -0,0 +1,11 @@
+QT      +=  webkitwidgets network widgets
+HEADERS =   previewer.h \
+            mainwindow.h
+SOURCES =   main.cpp \
+            previewer.cpp \
+            mainwindow.cpp
+FORMS   =   previewer.ui
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/previewer
+INSTALLS += target
diff --git a/examples/webkit/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui
index d4c9992..d4c9992 100644
--- a/examples/webkit/previewer/previewer.ui
+++ b/examples/webkitwidgets/previewer/previewer.ui
diff --git a/examples/scroller/plot/main.cpp b/examples/webkitwidgets/scroller/plot/main.cpp
index f6806a8..f6806a8 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/webkitwidgets/scroller/plot/main.cpp
diff --git a/examples/webkitwidgets/scroller/plot/plot.pro b/examples/webkitwidgets/scroller/plot/plot.pro
new file mode 100644
index 0000000..d89c50b
--- /dev/null
+++ b/examples/webkitwidgets/scroller/plot/plot.pro
@@ -0,0 +1,11 @@
+HEADERS       = settingswidget.h \
+                plotwidget.h
+SOURCES       = settingswidget.cpp \
+                plotwidget.cpp \
+                main.cpp
+
+QT += webkitwidgets widgets
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/scroller/plot
+INSTALLS += target
diff --git a/examples/scroller/plot/plotwidget.cpp b/examples/webkitwidgets/scroller/plot/plotwidget.cpp
index 12d3e8c..12d3e8c 100644
--- a/examples/scroller/plot/plotwidget.cpp
+++ b/examples/webkitwidgets/scroller/plot/plotwidget.cpp
diff --git a/examples/scroller/plot/plotwidget.h b/examples/webkitwidgets/scroller/plot/plotwidget.h
index 2260195..2260195 100644
--- a/examples/scroller/plot/plotwidget.h
+++ b/examples/webkitwidgets/scroller/plot/plotwidget.h
diff --git a/examples/scroller/plot/settingswidget.cpp b/examples/webkitwidgets/scroller/plot/settingswidget.cpp
index dd7efca..dd7efca 100644
--- a/examples/scroller/plot/settingswidget.cpp
+++ b/examples/webkitwidgets/scroller/plot/settingswidget.cpp
diff --git a/examples/scroller/plot/settingswidget.h b/examples/webkitwidgets/scroller/plot/settingswidget.h
index e31ea97..e31ea97 100644
--- a/examples/scroller/plot/settingswidget.h
+++ b/examples/webkitwidgets/scroller/plot/settingswidget.h
diff --git a/examples/scroller/scroller.pro b/examples/webkitwidgets/scroller/scroller.pro
index 2b9ea53..2b9ea53 100644
--- a/examples/scroller/scroller.pro
+++ b/examples/webkitwidgets/scroller/scroller.pro
diff --git a/examples/scroller/wheel/main.cpp b/examples/webkitwidgets/scroller/wheel/main.cpp
index 176eb7f..176eb7f 100644
--- a/examples/scroller/wheel/main.cpp
+++ b/examples/webkitwidgets/scroller/wheel/main.cpp
diff --git a/examples/webkitwidgets/scroller/wheel/wheel.pro b/examples/webkitwidgets/scroller/wheel/wheel.pro
new file mode 100644
index 0000000..4fb5e44
--- /dev/null
+++ b/examples/webkitwidgets/scroller/wheel/wheel.pro
@@ -0,0 +1,9 @@
+HEADERS       = wheelwidget.h
+SOURCES       = wheelwidget.cpp \
+                main.cpp
+
+QT += webkitwidgets widgets
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/scroller/wheel
+INSTALLS += target
diff --git a/examples/scroller/wheel/wheelwidget.cpp b/examples/webkitwidgets/scroller/wheel/wheelwidget.cpp
index 8864e82..8864e82 100644
--- a/examples/scroller/wheel/wheelwidget.cpp
+++ b/examples/webkitwidgets/scroller/wheel/wheelwidget.cpp
diff --git a/examples/scroller/wheel/wheelwidget.h b/examples/webkitwidgets/scroller/wheel/wheelwidget.h
index 77f6c53..77f6c53 100644
--- a/examples/scroller/wheel/wheelwidget.h
+++ b/examples/webkitwidgets/scroller/wheel/wheelwidget.h
diff --git a/examples/webkit/simpleselector/main.cpp b/examples/webkitwidgets/simpleselector/main.cpp
index a6da134..a6da134 100644
--- a/examples/webkit/simpleselector/main.cpp
+++ b/examples/webkitwidgets/simpleselector/main.cpp
diff --git a/examples/webkitwidgets/simpleselector/simpleselector.pro b/examples/webkitwidgets/simpleselector/simpleselector.pro
new file mode 100644
index 0000000..aa08390
--- /dev/null
+++ b/examples/webkitwidgets/simpleselector/simpleselector.pro
@@ -0,0 +1,9 @@
+QT       += webkitwidgets network widgets
+FORMS     = window.ui
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/simpleselector
+INSTALLS += target
diff --git a/examples/webkit/simpleselector/window.cpp b/examples/webkitwidgets/simpleselector/window.cpp
index d3f60d3..d3f60d3 100644
--- a/examples/webkit/simpleselector/window.cpp
+++ b/examples/webkitwidgets/simpleselector/window.cpp
diff --git a/examples/webkit/simpleselector/window.h b/examples/webkitwidgets/simpleselector/window.h
index a1a1316..a1a1316 100644
--- a/examples/webkit/simpleselector/window.h
+++ b/examples/webkitwidgets/simpleselector/window.h
diff --git a/examples/webkit/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui
index aa824df..aa824df 100644
--- a/examples/webkit/simpleselector/window.ui
+++ b/examples/webkitwidgets/simpleselector/window.ui
diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro
new file mode 100644
index 0000000..ab20df4
--- /dev/null
+++ b/examples/webkitwidgets/webkitwidgets.pro
@@ -0,0 +1,12 @@
+TEMPLATE =  subdirs
+SUBDIRS +=  domtraversal \
+            formextractor \
+            previewer \
+            fancybrowser \
+            simpleselector \
+            imageanalyzer \
+            framecapture \
+            browser \
+            embedded \
+            scroller \
+            xmlpatterns
diff --git a/examples/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
index ad43284..ad43284 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
diff --git a/examples/xmlpatterns/qobjectxmlmodel/main.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/main.cpp
index 090c14b..090c14b 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/main.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/main.cpp
diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
index c20e0a4..c20e0a4 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.h
index 8297151..8297151 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.h
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
index 18aba24..18aba24 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
index 46bf7df..46bf7df 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
new file mode 100644
index 0000000..6ade863
--- /dev/null
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
@@ -0,0 +1,10 @@
+
+FORMS       += forms/mainwindow.ui
+QT +=       xmlpatterns webkitwidgets widgets
+SOURCES     += qobjectxmlmodel.cpp main.cpp mainwindow.cpp xmlsyntaxhighlighter.cpp
+HEADERS     += qobjectxmlmodel.h mainwindow.h xmlsyntaxhighlighter.h
+RESOURCES   = queries.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/xmlpatterns/qobjectxmlmodel
+INSTALLS += target
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries.qrc b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries.qrc
index ec8cc6b..ec8cc6b 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries.qrc
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries.qrc
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
index 14a7a14..14a7a14 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
index 253cd43..253cd43 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.cpp
index 790a66f..790a66f 100644
--- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.cpp
diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.h
index b4fb9dd..b4fb9dd 100644
--- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.h
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/webkitwidgets/xmlpatterns/xmlpatterns.pro
index 4e8c909..4e8c909 100644
--- a/examples/xmlpatterns/xmlpatterns.pro
+++ b/examples/webkitwidgets/xmlpatterns/xmlpatterns.pro
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
deleted file mode 100644
index 77a71d5..0000000
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-
-FORMS       += forms/mainwindow.ui
-QT +=       xmlpatterns webkitwidgets widgets
-SOURCES     += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
-HEADERS     += qobjectxmlmodel.h  mainwindow.h ../shared/xmlsyntaxhighlighter.h
-RESOURCES   = queries.qrc
-INCLUDEPATH += ../shared/
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/xmlpatterns/qobjectxmlmodel
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/xmlpatterns/qobjectxmlmodel
-INSTALLS += target sources