Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix declarative examples and demos issue on Windows
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene
  Fix stack overwrite in QDBusDemarshaller
  Qt Linguist: Fix crashes
  fixed error generating wrong introspection string in header output file
  Backport SMP safe initialisation of QNetworkConfigurationManager
  Remove more "unused variable" warnings
  QTreeView: fix crash when starting a drag with hidden columns.
  Set execution bits for more scripts.
  Set execution bits for .test files.
  Fix more permissions (no execute bit).
  Fix permission (no execute bit).
  QGraphicsLayoutItem - bound constraint the minimum and maximum size
  Notify X11 of its resizable state through MWM Hints.

26 files changed, 0 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog
index ead97bd..ead97bd 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp
index 3d9cb9d..3d9cb9d 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h
index 5563e26..5563e26 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
index 5e2acd2..5e2acd2 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h
index 40624358..40624358 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h
diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp
index e00443d..e00443d 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h
index a8aba5c..a8aba5c 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h
+++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp
index 6b86232..6b86232 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h
index 7d6af6c..7d6af6c 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp
index 14bde38..14bde38 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h
index e88fd89..e88fd89 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js
index de2072a..de2072a 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js
index f96be0b..f96be0b 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json
index 1319cdf..1319cdf 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js
index d0f9cb4..d0f9cb4 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js
index 61fa2f7..61fa2f7 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
index 4b339ca..4b339ca 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
index 8ad44f8..8ad44f8 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
index 0693eb0..0693eb0 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
index fdad347..fdad347 100755..100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
diff --git a/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h b/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h
index b7fdc15..b7fdc15 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h
+++ b/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h
diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png
index d04df37..d04df37 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png
+++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png
diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png
index e824a21..e824a21 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png
+++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png
diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png
index 01ce692..01ce692 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png
+++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png
diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png
index b98fb36..b98fb36 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png
+++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png
diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png
index 035aeb2..035aeb2 100755..100644
--- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png
+++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png