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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  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.
  QSQLITE support only one statement at a time
  Symbian-linux crosscompilation configuration align
  Fix Symbian def-file
  Set execution bits for more scripts.
  SSL: fix build when compiled with -openssl-linked
  Set execution bits for .test files.
  New API to set AVKON flag to inputcontext in Qt/Symbian.
  Fix more permissions (no execute bit).
  Fix permission (no execute bit).
  Fixing memory leak in QtGui qt_cleanup
  QGraphicsLayoutItem - bound constraint the minimum and maximum size
  Notify X11 of its resizable state through MWM Hints.

21 files changed, 9 insertions, 9 deletions

diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png
index fc5c16d..fc5c16d 100755..100644
--- a/demos/embedded/styledemo/files/add.png
+++ b/demos/embedded/styledemo/files/add.png
diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png
index a0ab1fa..a0ab1fa 100755..100644
--- a/demos/embedded/styledemo/files/remove.png
+++ b/demos/embedded/styledemo/files/remove.png
diff --git a/demos/mobile/qcamera/businesscardhandling.cpp b/demos/mobile/qcamera/businesscardhandling.cpp
index f7467c4..f7467c4 100755..100644
--- a/demos/mobile/qcamera/businesscardhandling.cpp
+++ b/demos/mobile/qcamera/businesscardhandling.cpp
diff --git a/demos/mobile/qcamera/businesscardhandling.h b/demos/mobile/qcamera/businesscardhandling.h
index f67dd36..f67dd36 100755..100644
--- a/demos/mobile/qcamera/businesscardhandling.h
+++ b/demos/mobile/qcamera/businesscardhandling.h
diff --git a/demos/mobile/qcamera/button.cpp b/demos/mobile/qcamera/button.cpp
index 2a54cd8..2a54cd8 100755..100644
--- a/demos/mobile/qcamera/button.cpp
+++ b/demos/mobile/qcamera/button.cpp
diff --git a/demos/mobile/qcamera/button.h b/demos/mobile/qcamera/button.h
index f988713..f988713 100755..100644
--- a/demos/mobile/qcamera/button.h
+++ b/demos/mobile/qcamera/button.h
diff --git a/demos/mobile/qcamera/cameraexample.cpp b/demos/mobile/qcamera/cameraexample.cpp
index 1c6a4f0..1c6a4f0 100755..100644
--- a/demos/mobile/qcamera/cameraexample.cpp
+++ b/demos/mobile/qcamera/cameraexample.cpp
diff --git a/demos/mobile/qcamera/cameraexample.h b/demos/mobile/qcamera/cameraexample.h
index 8098ff4..8098ff4 100755..100644
--- a/demos/mobile/qcamera/cameraexample.h
+++ b/demos/mobile/qcamera/cameraexample.h
diff --git a/demos/mobile/qcamera/contactsdlg.cpp b/demos/mobile/qcamera/contactsdlg.cpp
index defd34c..defd34c 100755..100644
--- a/demos/mobile/qcamera/contactsdlg.cpp
+++ b/demos/mobile/qcamera/contactsdlg.cpp
diff --git a/demos/mobile/qcamera/contactsdlg.h b/demos/mobile/qcamera/contactsdlg.h
index 4397110..4397110 100755..100644
--- a/demos/mobile/qcamera/contactsdlg.h
+++ b/demos/mobile/qcamera/contactsdlg.h
diff --git a/demos/mobile/qcamera/icons/camera.png b/demos/mobile/qcamera/icons/camera.png
index dc4ecbf..dc4ecbf 100755..100644
--- a/demos/mobile/qcamera/icons/camera.png
+++ b/demos/mobile/qcamera/icons/camera.png
diff --git a/demos/mobile/qcamera/icons/cameramms_icon.svg b/demos/mobile/qcamera/icons/cameramms_icon.svg
index ae6f354..ae6f354 100755..100644
--- a/demos/mobile/qcamera/icons/cameramms_icon.svg
+++ b/demos/mobile/qcamera/icons/cameramms_icon.svg
diff --git a/demos/mobile/qcamera/icons/exit.png b/demos/mobile/qcamera/icons/exit.png
index dbe586a..dbe586a 100755..100644
--- a/demos/mobile/qcamera/icons/exit.png
+++ b/demos/mobile/qcamera/icons/exit.png
diff --git a/demos/mobile/qcamera/icons/mms.png b/demos/mobile/qcamera/icons/mms.png
index 46a1a73..46a1a73 100755..100644
--- a/demos/mobile/qcamera/icons/mms.png
+++ b/demos/mobile/qcamera/icons/mms.png
diff --git a/demos/mobile/qcamera/main.cpp b/demos/mobile/qcamera/main.cpp
index 6157c2d..6157c2d 100755..100644
--- a/demos/mobile/qcamera/main.cpp
+++ b/demos/mobile/qcamera/main.cpp
diff --git a/demos/mobile/qcamera/messagehandling.cpp b/demos/mobile/qcamera/messagehandling.cpp
index bf7bfcb..bf7bfcb 100755..100644
--- a/demos/mobile/qcamera/messagehandling.cpp
+++ b/demos/mobile/qcamera/messagehandling.cpp
diff --git a/demos/mobile/qcamera/messagehandling.h b/demos/mobile/qcamera/messagehandling.h
index 86a9071..86a9071 100755..100644
--- a/demos/mobile/qcamera/messagehandling.h
+++ b/demos/mobile/qcamera/messagehandling.h
diff --git a/demos/mobile/qcamera/qcamera.pro b/demos/mobile/qcamera/qcamera.pro
index 17b9513..17b9513 100755..100644
--- a/demos/mobile/qcamera/qcamera.pro
+++ b/demos/mobile/qcamera/qcamera.pro
diff --git a/demos/mobile/qcamera/resources.qrc b/demos/mobile/qcamera/resources.qrc
index 833fa99..833fa99 100755..100644
--- a/demos/mobile/qcamera/resources.qrc
+++ b/demos/mobile/qcamera/resources.qrc
diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png
index 3280afa..3280afa 100755..100644
--- a/demos/qtdemo/images/demobg.png
+++ b/demos/qtdemo/images/demobg.png
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 2fde945..1ed60e9 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <categories name="Qt Examples and Demos">
   <demos dirname="." docname="demos" name="Demonstrations">
-    <example filename="declarative/samegame" name="SameGame" executable="false" qml="true"/>
-    <example filename="declarative/flickr" name="Flickr Client" executable="false" qml="true"/>
+    <example filename="declarative/samegame" name="SameGame"/>
+    <example filename="declarative/flickr" name="Flickr Client"/>
     <example filename="affine" name="Affine Transformations" />
     <example filename="composition" name="Composition Modes" />
     <example filename="gradients" name="Gradients" />
@@ -11,8 +11,8 @@
     <example filename="chip" name="40000 Chips" />
     <example filename="embeddeddialogs" name="Embedded Dialogs" />
     <example filename="interview" name="Interview" />
-    <example filename="declarative/rssnews" name="Rss Client" executable="false" qml="true"/>
-    <example filename="declarative/twitter" name="Twitter Client" executable="false" qml="true"/>
+    <example filename="declarative/rssnews" name="Rss Client"/>
+    <example filename="declarative/twitter" name="Twitter Client"/>
     <example filename="browser" name="Browser" />
     <example filename="qmediaplayer" name="Media Player" />
     <example filename="boxes" name="Boxes" />
@@ -41,11 +41,11 @@
     <example filename="wordcount" name="Word Count" executable="false" />
   </category>
   <category dirname="declarative/toys" name="Qt Declarative Examples">
-    <example filename="dynamicscene" name="Dynamic Scene" executable="false" qml="true" />
-    <example filename="tic-tac-toe" name="Tic Tac Toe" executable="false" qml="true" />
-    <example filename="clocks" name="Clocks" executable="false" qml="true" />
-    <example filename="corkboards" name="Corkboards" executable="false" qml="true" />
-    <example filename="tvtennis" name="TV Tennis" executable="false" qml="true" />
+    <example filename="dynamicscene" name="Dynamic Scene"/>
+    <example filename="tic-tac-toe" name="Tic Tac Toe"/>
+    <example filename="clocks" name="Clocks"/>
+    <example filename="corkboards" name="Corkboards"/>
+    <example filename="tvtennis" name="TV Tennis"/>
   </category>
   <category dirname="designer" name="Qt Designer">
     <example filename="calculatorbuilder" name="Calculator Builder" />