diff options
539 files changed, 420 insertions, 85 deletions
diff --git a/.hgignore b/.hgignore index ba5a1b0eb8..ba5a1b0eb8 100755..100644 --- a/.hgignore +++ b/.hgignore diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml index c168654ae7..c168654ae7 100755..100644 --- a/config.profiles/harmattan/tests/create_tests_xml +++ b/config.profiles/harmattan/tests/create_tests_xml diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png Binary files differindex fc5c16d4c8..fc5c16d4c8 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 Binary files differindex a0ab1fa21a..a0ab1fa21a 100755..100644 --- a/demos/embedded/styledemo/files/remove.png +++ b/demos/embedded/styledemo/files/remove.png diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 24f06593d4..4ad31c359a 100644 --- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -90,7 +90,6 @@ class QmlApplicationViewerPrivate QString QmlApplicationViewerPrivate::adjustPath(const QString &path) { -#ifdef Q_OS_UNIX #ifdef Q_OS_MAC if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") @@ -101,7 +100,6 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; #endif -#endif return path; } diff --git a/demos/mobile/qcamera/businesscardhandling.cpp b/demos/mobile/qcamera/businesscardhandling.cpp index f7467c43f2..f7467c43f2 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 f67dd366fb..f67dd366fb 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 2a54cd8401..2a54cd8401 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 f988713c51..f988713c51 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 1c6a4f088e..1c6a4f088e 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 8098ff4307..8098ff4307 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 defd34c190..defd34c190 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 4397110426..4397110426 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 Binary files differindex dc4ecbf74f..dc4ecbf74f 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 ae6f354337..ae6f354337 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 Binary files differindex dbe586a934..dbe586a934 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 Binary files differindex 46a1a73d65..46a1a73d65 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 6157c2d456..6157c2d456 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 bf7bfcb8d0..bf7bfcb8d0 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 86a90712ec..86a90712ec 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 17b9513946..17b9513946 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 833fa99031..833fa99031 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 Binary files differindex 3280afaa3e..3280afaa3e 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 2fde945a45..1ed60e9bd9 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" /> diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png Binary files differindex ae857df7e6..ae857df7e6 100755..100644 --- a/doc/src/images/audiodevices-example.png +++ b/doc/src/images/audiodevices-example.png diff --git a/doc/src/images/audiooutput-example.png b/doc/src/images/audiooutput-example.png Binary files differindex 5588fbb57a..5588fbb57a 100755..100644 --- a/doc/src/images/audiooutput-example.png +++ b/doc/src/images/audiooutput-example.png diff --git a/doc/src/images/clock.png b/doc/src/images/clock.png Binary files differindex c7f6a1b296..c7f6a1b296 100755..100644 --- a/doc/src/images/clock.png +++ b/doc/src/images/clock.png diff --git a/doc/src/images/dummy_tree.png b/doc/src/images/dummy_tree.png Binary files differindex 7373ea60f6..7373ea60f6 100755..100644 --- a/doc/src/images/dummy_tree.png +++ b/doc/src/images/dummy_tree.png diff --git a/doc/src/images/edit.png b/doc/src/images/edit.png Binary files differindex 161b06f1bf..161b06f1bf 100755..100644 --- a/doc/src/images/edit.png +++ b/doc/src/images/edit.png diff --git a/doc/src/images/example_model.png b/doc/src/images/example_model.png Binary files differindex 4261261c7e..4261261c7e 100755..100644 --- a/doc/src/images/example_model.png +++ b/doc/src/images/example_model.png diff --git a/doc/src/images/lineedit.png b/doc/src/images/lineedit.png Binary files differindex 83d1c479f7..83d1c479f7 100755..100644 --- a/doc/src/images/lineedit.png +++ b/doc/src/images/lineedit.png diff --git a/doc/src/images/list_table_tree.png b/doc/src/images/list_table_tree.png Binary files differindex b2daf1f3a5..b2daf1f3a5 100755..100644 --- a/doc/src/images/list_table_tree.png +++ b/doc/src/images/list_table_tree.png diff --git a/doc/src/images/listview.png b/doc/src/images/listview.png Binary files differindex fa49c52c62..fa49c52c62 100755..100644 --- a/doc/src/images/listview.png +++ b/doc/src/images/listview.png diff --git a/doc/src/images/lotto.png b/doc/src/images/lotto.png Binary files differindex dd751cffd9..dd751cffd9 100755..100644 --- a/doc/src/images/lotto.png +++ b/doc/src/images/lotto.png diff --git a/doc/src/images/modelview-combobox.png b/doc/src/images/modelview-combobox.png Binary files differindex d172b413eb..d172b413eb 100755..100644 --- a/doc/src/images/modelview-combobox.png +++ b/doc/src/images/modelview-combobox.png diff --git a/doc/src/images/modelview-header.png b/doc/src/images/modelview-header.png Binary files differindex 2597635b9f..2597635b9f 100755..100644 --- a/doc/src/images/modelview-header.png +++ b/doc/src/images/modelview-header.png diff --git a/doc/src/images/modelview.png b/doc/src/images/modelview.png Binary files differindex 7b042af8a4..7b042af8a4 100755..100644 --- a/doc/src/images/modelview.png +++ b/doc/src/images/modelview.png diff --git a/doc/src/images/path.png b/doc/src/images/path.png Binary files differindex 73107ff5bb..73107ff5bb 100755..100644 --- a/doc/src/images/path.png +++ b/doc/src/images/path.png diff --git a/doc/src/images/qcompleter.png b/doc/src/images/qcompleter.png Binary files differindex d25caacc72..d25caacc72 100755..100644 --- a/doc/src/images/qcompleter.png +++ b/doc/src/images/qcompleter.png diff --git a/doc/src/images/readonlytable.png b/doc/src/images/readonlytable.png Binary files differindex 90bcba4a9b..90bcba4a9b 100755..100644 --- a/doc/src/images/readonlytable.png +++ b/doc/src/images/readonlytable.png diff --git a/doc/src/images/readonlytable_role.png b/doc/src/images/readonlytable_role.png Binary files differindex 7d2d416a53..7d2d416a53 100755..100644 --- a/doc/src/images/readonlytable_role.png +++ b/doc/src/images/readonlytable_role.png diff --git a/doc/src/images/selection2.png b/doc/src/images/selection2.png Binary files differindex 66c757f88e..66c757f88e 100755..100644 --- a/doc/src/images/selection2.png +++ b/doc/src/images/selection2.png diff --git a/doc/src/images/standardwidget.png b/doc/src/images/standardwidget.png Binary files differindex 3ccccf14a3..3ccccf14a3 100755..100644 --- a/doc/src/images/standardwidget.png +++ b/doc/src/images/standardwidget.png diff --git a/doc/src/images/tableview.png b/doc/src/images/tableview.png Binary files differindex 8be1b6ce62..8be1b6ce62 100755..100644 --- a/doc/src/images/tableview.png +++ b/doc/src/images/tableview.png diff --git a/doc/src/images/tree.png b/doc/src/images/tree.png Binary files differindex 3f046c9b24..3f046c9b24 100755..100644 --- a/doc/src/images/tree.png +++ b/doc/src/images/tree.png diff --git a/doc/src/images/tree_2.png b/doc/src/images/tree_2.png Binary files differindex 6ee1f4aa48..6ee1f4aa48 100755..100644 --- a/doc/src/images/tree_2.png +++ b/doc/src/images/tree_2.png diff --git a/doc/src/images/tree_2_with_algorithm.png b/doc/src/images/tree_2_with_algorithm.png Binary files differindex ecf91012bf..ecf91012bf 100755..100644 --- a/doc/src/images/tree_2_with_algorithm.png +++ b/doc/src/images/tree_2_with_algorithm.png diff --git a/doc/src/images/tree_city.png b/doc/src/images/tree_city.png Binary files differindex 57f03d9d6d..57f03d9d6d 100755..100644 --- a/doc/src/images/tree_city.png +++ b/doc/src/images/tree_city.png diff --git a/doc/src/images/treeview.png b/doc/src/images/treeview.png Binary files differindex af31fe9bf1..af31fe9bf1 100755..100644 --- a/doc/src/images/treeview.png +++ b/doc/src/images/treeview.png diff --git a/doc/src/images/treeview_sml.png b/doc/src/images/treeview_sml.png Binary files differindex fb6de1d863..fb6de1d863 100755..100644 --- a/doc/src/images/treeview_sml.png +++ b/doc/src/images/treeview_sml.png diff --git a/doc/src/images/widgetmapper.png b/doc/src/images/widgetmapper.png Binary files differindex 9627088077..9627088077 100755..100644 --- a/doc/src/images/widgetmapper.png +++ b/doc/src/images/widgetmapper.png diff --git a/doc/src/template/images/bg_l.png b/doc/src/template/images/bg_l.png Binary files differindex 90b1da10b9..90b1da10b9 100755..100644 --- a/doc/src/template/images/bg_l.png +++ b/doc/src/template/images/bg_l.png diff --git a/doc/src/template/images/bg_l_blank.png b/doc/src/template/images/bg_l_blank.png Binary files differindex 5a9673d81b..5a9673d81b 100755..100644 --- a/doc/src/template/images/bg_l_blank.png +++ b/doc/src/template/images/bg_l_blank.png diff --git a/doc/src/template/images/bg_r.png b/doc/src/template/images/bg_r.png Binary files differindex f0fb121dea..f0fb121dea 100755..100644 --- a/doc/src/template/images/bg_r.png +++ b/doc/src/template/images/bg_r.png diff --git a/doc/src/template/images/box_bg.png b/doc/src/template/images/box_bg.png Binary files differindex 3322f923f8..3322f923f8 100755..100644 --- a/doc/src/template/images/box_bg.png +++ b/doc/src/template/images/box_bg.png diff --git a/doc/src/template/images/breadcrumb.png b/doc/src/template/images/breadcrumb.png Binary files differindex 0ded5514d2..0ded5514d2 100755..100644 --- a/doc/src/template/images/breadcrumb.png +++ b/doc/src/template/images/breadcrumb.png diff --git a/doc/src/template/images/bullet_gt.png b/doc/src/template/images/bullet_gt.png Binary files differindex 7561b4edc4..7561b4edc4 100755..100644 --- a/doc/src/template/images/bullet_gt.png +++ b/doc/src/template/images/bullet_gt.png diff --git a/doc/src/template/images/bullet_sq.png b/doc/src/template/images/bullet_sq.png Binary files differindex a84845e3c7..a84845e3c7 100755..100644 --- a/doc/src/template/images/bullet_sq.png +++ b/doc/src/template/images/bullet_sq.png diff --git a/doc/src/template/images/feedbackground.png b/doc/src/template/images/feedbackground.png Binary files differindex 3a38d995d7..3a38d995d7 100755..100644 --- a/doc/src/template/images/feedbackground.png +++ b/doc/src/template/images/feedbackground.png diff --git a/doc/src/template/images/horBar.png b/doc/src/template/images/horBar.png Binary files differindex 100fe91c6c..100fe91c6c 100755..100644 --- a/doc/src/template/images/horBar.png +++ b/doc/src/template/images/horBar.png diff --git a/doc/src/template/images/page_bg.png b/doc/src/template/images/page_bg.png Binary files differindex 9b3bd999df..9b3bd999df 100755..100644 --- a/doc/src/template/images/page_bg.png +++ b/doc/src/template/images/page_bg.png diff --git a/doc/src/template/images/sprites-combined.png b/doc/src/template/images/sprites-combined.png Binary files differindex 3a48b21f6b..3a48b21f6b 100755..100644 --- a/doc/src/template/images/sprites-combined.png +++ b/doc/src/template/images/sprites-combined.png diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index af204d8d06..af204d8d06 100755..100644 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js diff --git a/doc/src/template/scripts/jquery.js b/doc/src/template/scripts/jquery.js index 0c7294c90a..0c7294c90a 100755..100644 --- a/doc/src/template/scripts/jquery.js +++ b/doc/src/template/scripts/jquery.js diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 4071145ec0..4071145ec0 100755..100644 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css diff --git a/doc/src/template/style/style_ie6.css b/doc/src/template/style/style_ie6.css index 16fb8505df..16fb8505df 100755..100644 --- a/doc/src/template/style/style_ie6.css +++ b/doc/src/template/style/style_ie6.css diff --git a/doc/src/template/style/style_ie7.css b/doc/src/template/style/style_ie7.css index afbff5f88e..afbff5f88e 100755..100644 --- a/doc/src/template/style/style_ie7.css +++ b/doc/src/template/style/style_ie7.css diff --git a/doc/src/template/style/style_ie8.css b/doc/src/template/style/style_ie8.css index e69de29bb2..e69de29bb2 100755..100644 --- a/doc/src/template/style/style_ie8.css +++ b/doc/src/template/style/style_ie8.css diff --git a/examples/declarative/shadereffects/main.cpp b/examples/declarative/shadereffects/main.cpp index e191bfae8f..e191bfae8f 100755..100644 --- a/examples/declarative/shadereffects/main.cpp +++ b/examples/declarative/shadereffects/main.cpp diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index 58e7ab7d27..58e7ab7d27 100755..100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml index 1788e6c0aa..c2846b1799 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml @@ -146,27 +146,27 @@ Item { PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "Sun.qml" - image: "../images/sun.png" + image: "images/sun.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "GenericSceneItem.qml" - image: "../images/moon.png" + image: "images/moon.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - image: "../images/tree_s.png" + image: "images/tree_s.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - image: "../images/rabbit_brown.png" + image: "images/rabbit_brown.png" } PaletteItem { anchors.verticalCenter: parent.verticalCenter componentFile: "PerspectiveItem.qml" - image: "../images/rabbit_bw.png" + image: "images/rabbit_bw.png" } } } diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro index c81d8f08da..4fdb47c957 100644 --- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro +++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro @@ -31,6 +31,7 @@ symbian:TARGET.UID3 = 0xEFDDF868 # CONFIG += mobility # MOBILITY += +TARGET = tic-tac-toe # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index ccc3f9dae2..ccc3f9dae2 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml index c3fd90d9cf..c3fd90d9cf 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl index 670354c965..670354c965 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php index daf480e21b..daf480e21b 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 24f06593d4..4ad31c359a 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -90,7 +90,6 @@ class QmlApplicationViewerPrivate QString QmlApplicationViewerPrivate::adjustPath(const QString &path) { -#ifdef Q_OS_UNIX #ifdef Q_OS_MAC if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") @@ -101,7 +100,6 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; #endif -#endif return path; } diff --git a/examples/network/bearercloud/lan.svg b/examples/network/bearercloud/lan.svg index 4f7f63d013..4f7f63d013 100755..100644 --- a/examples/network/bearercloud/lan.svg +++ b/examples/network/bearercloud/lan.svg diff --git a/examples/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/tutorials/gettingStarted/gsQt/gsqt.pro index 72f09c114b..72f09c114b 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/gsqt.pro +++ b/examples/tutorials/gettingStarted/gsQt/gsqt.pro diff --git a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp index eaf04256d9..eaf04256d9 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp diff --git a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro index f52a6331b5..f52a6331b5 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro +++ b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp index afa26e1240..afa26e1240 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp diff --git a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro index 383c3ce5ba..383c3ce5ba 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro +++ b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro diff --git a/examples/tutorials/gettingStarted/gsQt/part3/main.cpp b/examples/tutorials/gettingStarted/gsQt/part3/main.cpp index 59ff9c40ea..59ff9c40ea 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part3/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part3/main.cpp diff --git a/examples/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/tutorials/gettingStarted/gsQt/part3/part3.pro index d194acb2e2..d194acb2e2 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part3/part3.pro +++ b/examples/tutorials/gettingStarted/gsQt/part3/part3.pro diff --git a/examples/tutorials/gettingStarted/gsQt/part4/main.cpp b/examples/tutorials/gettingStarted/gsQt/part4/main.cpp index ba18afb749..ba18afb749 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part4/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part4/main.cpp diff --git a/examples/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/tutorials/gettingStarted/gsQt/part4/part4.pro index 3de03accc0..3de03accc0 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part4/part4.pro +++ b/examples/tutorials/gettingStarted/gsQt/part4/part4.pro diff --git a/examples/tutorials/gettingStarted/gsQt/part5/main.cpp b/examples/tutorials/gettingStarted/gsQt/part5/main.cpp index 4a6257d10e..4a6257d10e 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part5/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part5/main.cpp diff --git a/examples/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/tutorials/gettingStarted/gsQt/part5/part5.pro index 711cac212a..711cac212a 100755..100644 --- a/examples/tutorials/gettingStarted/gsQt/part5/part5.pro +++ b/examples/tutorials/gettingStarted/gsQt/part5/part5.pro diff --git a/examples/tutorials/modelview/1_readonly/1_readonly.pro b/examples/tutorials/modelview/1_readonly/1_readonly.pro index 1178aade0b..1178aade0b 100755..100644 --- a/examples/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/tutorials/modelview/1_readonly/1_readonly.pro diff --git a/examples/tutorials/modelview/1_readonly/main.cpp b/examples/tutorials/modelview/1_readonly/main.cpp index fdde141b4c..fdde141b4c 100755..100644 --- a/examples/tutorials/modelview/1_readonly/main.cpp +++ b/examples/tutorials/modelview/1_readonly/main.cpp diff --git a/examples/tutorials/modelview/1_readonly/mymodel.cpp b/examples/tutorials/modelview/1_readonly/mymodel.cpp index 9b5bdd7df2..9b5bdd7df2 100755..100644 --- a/examples/tutorials/modelview/1_readonly/mymodel.cpp +++ b/examples/tutorials/modelview/1_readonly/mymodel.cpp diff --git a/examples/tutorials/modelview/1_readonly/mymodel.h b/examples/tutorials/modelview/1_readonly/mymodel.h index f60546897a..f60546897a 100755..100644 --- a/examples/tutorials/modelview/1_readonly/mymodel.h +++ b/examples/tutorials/modelview/1_readonly/mymodel.h diff --git a/examples/tutorials/modelview/2_formatting/2_formatting.pro b/examples/tutorials/modelview/2_formatting/2_formatting.pro index 98caab7277..98caab7277 100755..100644 --- a/examples/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/tutorials/modelview/2_formatting/2_formatting.pro diff --git a/examples/tutorials/modelview/2_formatting/main.cpp b/examples/tutorials/modelview/2_formatting/main.cpp index fdde141b4c..fdde141b4c 100755..100644 --- a/examples/tutorials/modelview/2_formatting/main.cpp +++ b/examples/tutorials/modelview/2_formatting/main.cpp diff --git a/examples/tutorials/modelview/2_formatting/mymodel.cpp b/examples/tutorials/modelview/2_formatting/mymodel.cpp index 8363af9252..8363af9252 100755..100644 --- a/examples/tutorials/modelview/2_formatting/mymodel.cpp +++ b/examples/tutorials/modelview/2_formatting/mymodel.cpp diff --git a/examples/tutorials/modelview/2_formatting/mymodel.h b/examples/tutorials/modelview/2_formatting/mymodel.h index 7ad876c1bf..7ad876c1bf 100755..100644 --- a/examples/tutorials/modelview/2_formatting/mymodel.h +++ b/examples/tutorials/modelview/2_formatting/mymodel.h diff --git a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 3b338ddbad..3b338ddbad 100755..100644 --- a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro diff --git a/examples/tutorials/modelview/3_changingmodel/main.cpp b/examples/tutorials/modelview/3_changingmodel/main.cpp index 8a4ab8f6ab..8a4ab8f6ab 100755..100644 --- a/examples/tutorials/modelview/3_changingmodel/main.cpp +++ b/examples/tutorials/modelview/3_changingmodel/main.cpp diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp index fa50005701..fa50005701 100755..100644 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h index be59c59207..be59c59207 100755..100644 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.h +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h diff --git a/examples/tutorials/modelview/4_headers/4_headers.pro b/examples/tutorials/modelview/4_headers/4_headers.pro index 6f93c621be..6f93c621be 100755..100644 --- a/examples/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/tutorials/modelview/4_headers/4_headers.pro diff --git a/examples/tutorials/modelview/4_headers/main.cpp b/examples/tutorials/modelview/4_headers/main.cpp index 8a4ab8f6ab..8a4ab8f6ab 100755..100644 --- a/examples/tutorials/modelview/4_headers/main.cpp +++ b/examples/tutorials/modelview/4_headers/main.cpp diff --git a/examples/tutorials/modelview/4_headers/mymodel.cpp b/examples/tutorials/modelview/4_headers/mymodel.cpp index ee0e609228..ee0e609228 100755..100644 --- a/examples/tutorials/modelview/4_headers/mymodel.cpp +++ b/examples/tutorials/modelview/4_headers/mymodel.cpp diff --git a/examples/tutorials/modelview/4_headers/mymodel.h b/examples/tutorials/modelview/4_headers/mymodel.h index 5a185d92e4..5a185d92e4 100755..100644 --- a/examples/tutorials/modelview/4_headers/mymodel.h +++ b/examples/tutorials/modelview/4_headers/mymodel.h diff --git a/examples/tutorials/modelview/5_edit/5_edit.pro b/examples/tutorials/modelview/5_edit/5_edit.pro index 6d273064c3..6d273064c3 100755..100644 --- a/examples/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/tutorials/modelview/5_edit/5_edit.pro diff --git a/examples/tutorials/modelview/5_edit/main.cpp b/examples/tutorials/modelview/5_edit/main.cpp index 75246f7dc7..75246f7dc7 100755..100644 --- a/examples/tutorials/modelview/5_edit/main.cpp +++ b/examples/tutorials/modelview/5_edit/main.cpp diff --git a/examples/tutorials/modelview/5_edit/mainwindow.cpp b/examples/tutorials/modelview/5_edit/mainwindow.cpp index 4b7e59a290..4b7e59a290 100755..100644 --- a/examples/tutorials/modelview/5_edit/mainwindow.cpp +++ b/examples/tutorials/modelview/5_edit/mainwindow.cpp diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h index 37303f8293..37303f8293 100755..100644 --- a/examples/tutorials/modelview/5_edit/mainwindow.h +++ b/examples/tutorials/modelview/5_edit/mainwindow.h diff --git a/examples/tutorials/modelview/5_edit/mymodel.cpp b/examples/tutorials/modelview/5_edit/mymodel.cpp index e5d20949b3..e5d20949b3 100755..100644 --- a/examples/tutorials/modelview/5_edit/mymodel.cpp +++ b/examples/tutorials/modelview/5_edit/mymodel.cpp diff --git a/examples/tutorials/modelview/5_edit/mymodel.h b/examples/tutorials/modelview/5_edit/mymodel.h index ecfd58ef6b..ecfd58ef6b 100755..100644 --- a/examples/tutorials/modelview/5_edit/mymodel.h +++ b/examples/tutorials/modelview/5_edit/mymodel.h diff --git a/examples/tutorials/modelview/6_treeview/6_treeview.pro b/examples/tutorials/modelview/6_treeview/6_treeview.pro index 0acd8c12a7..0acd8c12a7 100755..100644 --- a/examples/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/tutorials/modelview/6_treeview/6_treeview.pro diff --git a/examples/tutorials/modelview/6_treeview/main.cpp b/examples/tutorials/modelview/6_treeview/main.cpp index 75246f7dc7..75246f7dc7 100755..100644 --- a/examples/tutorials/modelview/6_treeview/main.cpp +++ b/examples/tutorials/modelview/6_treeview/main.cpp diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.cpp b/examples/tutorials/modelview/6_treeview/mainwindow.cpp index 0fa8da0ec4..0fa8da0ec4 100755..100644 --- a/examples/tutorials/modelview/6_treeview/mainwindow.cpp +++ b/examples/tutorials/modelview/6_treeview/mainwindow.cpp diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index 6398485cda..6398485cda 100755..100644 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h diff --git a/examples/tutorials/modelview/7_selections/7_selections.pro b/examples/tutorials/modelview/7_selections/7_selections.pro index 4a90751137..4a90751137 100755..100644 --- a/examples/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/tutorials/modelview/7_selections/7_selections.pro diff --git a/examples/tutorials/modelview/7_selections/main.cpp b/examples/tutorials/modelview/7_selections/main.cpp index 75246f7dc7..75246f7dc7 100755..100644 --- a/examples/tutorials/modelview/7_selections/main.cpp +++ b/examples/tutorials/modelview/7_selections/main.cpp diff --git a/examples/tutorials/modelview/7_selections/mainwindow.cpp b/examples/tutorials/modelview/7_selections/mainwindow.cpp index 3bd36d9df4..3bd36d9df4 100755..100644 --- a/examples/tutorials/modelview/7_selections/mainwindow.cpp +++ b/examples/tutorials/modelview/7_selections/mainwindow.cpp diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index 0a30dab085..0a30dab085 100755..100644 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h diff --git a/examples/tutorials/modelview/modelview.pro b/examples/tutorials/modelview/modelview.pro index 1ee7574e73..1ee7574e73 100755..100644 --- a/examples/tutorials/modelview/modelview.pro +++ b/examples/tutorials/modelview/modelview.pro diff --git a/examples/tutorials/threads/clock/clock.pro b/examples/tutorials/threads/clock/clock.pro index 450bfe4a4e..450bfe4a4e 100755..100644 --- a/examples/tutorials/threads/clock/clock.pro +++ b/examples/tutorials/threads/clock/clock.pro diff --git a/examples/tutorials/threads/clock/main.cpp b/examples/tutorials/threads/clock/main.cpp index a0f86d6bc7..a0f86d6bc7 100755..100644 --- a/examples/tutorials/threads/clock/main.cpp +++ b/examples/tutorials/threads/clock/main.cpp diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp b/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp index 26ee2557a9..26ee2557a9 100755..100644 --- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp +++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro index 30e9413ea7..30e9413ea7 100755..100644 --- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro +++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro diff --git a/examples/tutorials/threads/hellothread/hellothread.cpp b/examples/tutorials/threads/hellothread/hellothread.cpp index 01cd0f5b3c..01cd0f5b3c 100755..100644 --- a/examples/tutorials/threads/hellothread/hellothread.cpp +++ b/examples/tutorials/threads/hellothread/hellothread.cpp diff --git a/examples/tutorials/threads/hellothread/hellothread.h b/examples/tutorials/threads/hellothread/hellothread.h index a3202c6396..a3202c6396 100755..100644 --- a/examples/tutorials/threads/hellothread/hellothread.h +++ b/examples/tutorials/threads/hellothread/hellothread.h diff --git a/examples/tutorials/threads/hellothread/hellothread.pro b/examples/tutorials/threads/hellothread/hellothread.pro index fee7025f37..fee7025f37 100755..100644 --- a/examples/tutorials/threads/hellothread/hellothread.pro +++ b/examples/tutorials/threads/hellothread/hellothread.pro diff --git a/examples/tutorials/threads/hellothread/main.cpp b/examples/tutorials/threads/hellothread/main.cpp index 9a548ea96a..9a548ea96a 100755..100644 --- a/examples/tutorials/threads/hellothread/main.cpp +++ b/examples/tutorials/threads/hellothread/main.cpp diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp b/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp index 30410a5570..30410a5570 100755..100644 --- a/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp +++ b/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro index 9cf9c73faf..9cf9c73faf 100755..100644 --- a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro +++ b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro diff --git a/examples/tutorials/threads/movedobject/main.cpp b/examples/tutorials/threads/movedobject/main.cpp index a244316689..a244316689 100755..100644 --- a/examples/tutorials/threads/movedobject/main.cpp +++ b/examples/tutorials/threads/movedobject/main.cpp diff --git a/examples/tutorials/threads/movedobject/movedobject.pro b/examples/tutorials/threads/movedobject/movedobject.pro index 678d1d9217..678d1d9217 100755..100644 --- a/examples/tutorials/threads/movedobject/movedobject.pro +++ b/examples/tutorials/threads/movedobject/movedobject.pro diff --git a/examples/webkit/formextractor/form.html b/examples/webkit/formextractor/form.html index 6b0bbde976..6b0bbde976 100755..100644 --- a/examples/webkit/formextractor/form.html +++ b/examples/webkit/formextractor/form.html diff --git a/examples/webkit/webkit-guide/css/anim_accord.css b/examples/webkit/webkit-guide/css/anim_accord.css index c9c013affa..c9c013affa 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_accord.css +++ b/examples/webkit/webkit-guide/css/anim_accord.css diff --git a/examples/webkit/webkit-guide/css/anim_demo-rotate.css b/examples/webkit/webkit-guide/css/anim_demo-rotate.css index fa3bd0dee8..fa3bd0dee8 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_demo-rotate.css +++ b/examples/webkit/webkit-guide/css/anim_demo-rotate.css diff --git a/examples/webkit/webkit-guide/css/anim_demo-scale.css b/examples/webkit/webkit-guide/css/anim_demo-scale.css index 4af469a61e..4af469a61e 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_demo-scale.css +++ b/examples/webkit/webkit-guide/css/anim_demo-scale.css diff --git a/examples/webkit/webkit-guide/css/anim_demo-skew.css b/examples/webkit/webkit-guide/css/anim_demo-skew.css index 2d90bf9574..2d90bf9574 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_demo-skew.css +++ b/examples/webkit/webkit-guide/css/anim_demo-skew.css diff --git a/examples/webkit/webkit-guide/css/anim_gallery.css b/examples/webkit/webkit-guide/css/anim_gallery.css index fe14aa263c..fe14aa263c 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_gallery.css +++ b/examples/webkit/webkit-guide/css/anim_gallery.css diff --git a/examples/webkit/webkit-guide/css/anim_panel.css b/examples/webkit/webkit-guide/css/anim_panel.css index 87037c9a9e..87037c9a9e 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_panel.css +++ b/examples/webkit/webkit-guide/css/anim_panel.css diff --git a/examples/webkit/webkit-guide/css/anim_pulse.css b/examples/webkit/webkit-guide/css/anim_pulse.css index 4b850b9bc8..4b850b9bc8 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_pulse.css +++ b/examples/webkit/webkit-guide/css/anim_pulse.css diff --git a/examples/webkit/webkit-guide/css/anim_skew.css b/examples/webkit/webkit-guide/css/anim_skew.css index e44a633e96..e44a633e96 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_skew.css +++ b/examples/webkit/webkit-guide/css/anim_skew.css diff --git a/examples/webkit/webkit-guide/css/anim_slide.css b/examples/webkit/webkit-guide/css/anim_slide.css index 7997cc2c2b..7997cc2c2b 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_slide.css +++ b/examples/webkit/webkit-guide/css/anim_slide.css diff --git a/examples/webkit/webkit-guide/css/anim_tabbedSkew.css b/examples/webkit/webkit-guide/css/anim_tabbedSkew.css index 1c03e48966..1c03e48966 100755..100644 --- a/examples/webkit/webkit-guide/css/anim_tabbedSkew.css +++ b/examples/webkit/webkit-guide/css/anim_tabbedSkew.css diff --git a/examples/webkit/webkit-guide/css/css3_backgrounds.css b/examples/webkit/webkit-guide/css/css3_backgrounds.css index c2a3a300e0..c2a3a300e0 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_backgrounds.css +++ b/examples/webkit/webkit-guide/css/css3_backgrounds.css diff --git a/examples/webkit/webkit-guide/css/css3_border-img.css b/examples/webkit/webkit-guide/css/css3_border-img.css index 1293e2e27c..1293e2e27c 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_border-img.css +++ b/examples/webkit/webkit-guide/css/css3_border-img.css diff --git a/examples/webkit/webkit-guide/css/css3_grad-radial.css b/examples/webkit/webkit-guide/css/css3_grad-radial.css index 7799153dbd..7799153dbd 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_grad-radial.css +++ b/examples/webkit/webkit-guide/css/css3_grad-radial.css diff --git a/examples/webkit/webkit-guide/css/css3_gradientBack.css b/examples/webkit/webkit-guide/css/css3_gradientBack.css index 48f9d68633..48f9d68633 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_gradientBack.css +++ b/examples/webkit/webkit-guide/css/css3_gradientBack.css diff --git a/examples/webkit/webkit-guide/css/css3_gradientBackStop.css b/examples/webkit/webkit-guide/css/css3_gradientBackStop.css index 0fbaf526ef..0fbaf526ef 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_gradientBackStop.css +++ b/examples/webkit/webkit-guide/css/css3_gradientBackStop.css diff --git a/examples/webkit/webkit-guide/css/css3_gradientButton.css b/examples/webkit/webkit-guide/css/css3_gradientButton.css index 6d0c9f77c8..6d0c9f77c8 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_gradientButton.css +++ b/examples/webkit/webkit-guide/css/css3_gradientButton.css diff --git a/examples/webkit/webkit-guide/css/css3_mask-grad.css b/examples/webkit/webkit-guide/css/css3_mask-grad.css index 24f0b227a7..24f0b227a7 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_mask-grad.css +++ b/examples/webkit/webkit-guide/css/css3_mask-grad.css diff --git a/examples/webkit/webkit-guide/css/css3_mask-img.css b/examples/webkit/webkit-guide/css/css3_mask-img.css index 0203d814fc..0203d814fc 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_mask-img.css +++ b/examples/webkit/webkit-guide/css/css3_mask-img.css diff --git a/examples/webkit/webkit-guide/css/css3_multicol.css b/examples/webkit/webkit-guide/css/css3_multicol.css index 3c07f8b604..3c07f8b604 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_multicol.css +++ b/examples/webkit/webkit-guide/css/css3_multicol.css diff --git a/examples/webkit/webkit-guide/css/css3_reflect.css b/examples/webkit/webkit-guide/css/css3_reflect.css index 1f2e4542e8..1f2e4542e8 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_reflect.css +++ b/examples/webkit/webkit-guide/css/css3_reflect.css diff --git a/examples/webkit/webkit-guide/css/css3_scroll.css b/examples/webkit/webkit-guide/css/css3_scroll.css index ae37c34d1e..ae37c34d1e 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_scroll.css +++ b/examples/webkit/webkit-guide/css/css3_scroll.css diff --git a/examples/webkit/webkit-guide/css/css3_sel-nth.css b/examples/webkit/webkit-guide/css/css3_sel-nth.css index aa1e04b52a..aa1e04b52a 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_sel-nth.css +++ b/examples/webkit/webkit-guide/css/css3_sel-nth.css diff --git a/examples/webkit/webkit-guide/css/css3_shadow.css b/examples/webkit/webkit-guide/css/css3_shadow.css index d2f3040a4a..d2f3040a4a 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_shadow.css +++ b/examples/webkit/webkit-guide/css/css3_shadow.css diff --git a/examples/webkit/webkit-guide/css/css3_shadowBlur.css b/examples/webkit/webkit-guide/css/css3_shadowBlur.css index f44892735d..f44892735d 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_shadowBlur.css +++ b/examples/webkit/webkit-guide/css/css3_shadowBlur.css diff --git a/examples/webkit/webkit-guide/css/css3_text-overflow.css b/examples/webkit/webkit-guide/css/css3_text-overflow.css index ba491c41ae..ba491c41ae 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_text-overflow.css +++ b/examples/webkit/webkit-guide/css/css3_text-overflow.css diff --git a/examples/webkit/webkit-guide/css/css3_text-shadow.css b/examples/webkit/webkit-guide/css/css3_text-shadow.css index 9f06662c95..9f06662c95 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_text-shadow.css +++ b/examples/webkit/webkit-guide/css/css3_text-shadow.css diff --git a/examples/webkit/webkit-guide/css/css3_text-stroke.css b/examples/webkit/webkit-guide/css/css3_text-stroke.css index 4116de8223..4116de8223 100755..100644 --- a/examples/webkit/webkit-guide/css/css3_text-stroke.css +++ b/examples/webkit/webkit-guide/css/css3_text-stroke.css diff --git a/examples/webkit/webkit-guide/css/form_tapper.css b/examples/webkit/webkit-guide/css/form_tapper.css index 75142b5b19..75142b5b19 100755..100644 --- a/examples/webkit/webkit-guide/css/form_tapper.css +++ b/examples/webkit/webkit-guide/css/form_tapper.css diff --git a/examples/webkit/webkit-guide/css/form_toggler.css b/examples/webkit/webkit-guide/css/form_toggler.css index 224053f834..224053f834 100755..100644 --- a/examples/webkit/webkit-guide/css/form_toggler.css +++ b/examples/webkit/webkit-guide/css/form_toggler.css diff --git a/examples/webkit/webkit-guide/css/layout_link-fmt.css b/examples/webkit/webkit-guide/css/layout_link-fmt.css index 5a31aa0736..5a31aa0736 100755..100644 --- a/examples/webkit/webkit-guide/css/layout_link-fmt.css +++ b/examples/webkit/webkit-guide/css/layout_link-fmt.css diff --git a/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css b/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css index 1205822e6d..1205822e6d 100755..100644 --- a/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css +++ b/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css diff --git a/examples/webkit/webkit-guide/css/mob_condjs.css b/examples/webkit/webkit-guide/css/mob_condjs.css index 6e312926ec..6e312926ec 100755..100644 --- a/examples/webkit/webkit-guide/css/mob_condjs.css +++ b/examples/webkit/webkit-guide/css/mob_condjs.css diff --git a/examples/webkit/webkit-guide/css/mob_mediaquery.css b/examples/webkit/webkit-guide/css/mob_mediaquery.css index bbd0fbcc88..bbd0fbcc88 100755..100644 --- a/examples/webkit/webkit-guide/css/mob_mediaquery.css +++ b/examples/webkit/webkit-guide/css/mob_mediaquery.css diff --git a/examples/webkit/webkit-guide/css/mobile.css b/examples/webkit/webkit-guide/css/mobile.css index 5b9332c3ce..5b9332c3ce 100755..100644 --- a/examples/webkit/webkit-guide/css/mobile.css +++ b/examples/webkit/webkit-guide/css/mobile.css diff --git a/examples/webkit/webkit-guide/css/mq_desktop.css b/examples/webkit/webkit-guide/css/mq_desktop.css index 32d49bfa63..32d49bfa63 100755..100644 --- a/examples/webkit/webkit-guide/css/mq_desktop.css +++ b/examples/webkit/webkit-guide/css/mq_desktop.css diff --git a/examples/webkit/webkit-guide/css/mq_mobile.css b/examples/webkit/webkit-guide/css/mq_mobile.css index f1e87f67ce..f1e87f67ce 100755..100644 --- a/examples/webkit/webkit-guide/css/mq_mobile.css +++ b/examples/webkit/webkit-guide/css/mq_mobile.css diff --git a/examples/webkit/webkit-guide/css/mq_touch.css b/examples/webkit/webkit-guide/css/mq_touch.css index 3d2a5b6cd5..3d2a5b6cd5 100755..100644 --- a/examples/webkit/webkit-guide/css/mq_touch.css +++ b/examples/webkit/webkit-guide/css/mq_touch.css diff --git a/examples/webkit/webkit-guide/css/mqlayout_desktop.css b/examples/webkit/webkit-guide/css/mqlayout_desktop.css index 0875732145..0875732145 100755..100644 --- a/examples/webkit/webkit-guide/css/mqlayout_desktop.css +++ b/examples/webkit/webkit-guide/css/mqlayout_desktop.css diff --git a/examples/webkit/webkit-guide/css/mqlayout_mobile.css b/examples/webkit/webkit-guide/css/mqlayout_mobile.css index dcd4943749..dcd4943749 100755..100644 --- a/examples/webkit/webkit-guide/css/mqlayout_mobile.css +++ b/examples/webkit/webkit-guide/css/mqlayout_mobile.css diff --git a/examples/webkit/webkit-guide/css/mqlayout_touch.css b/examples/webkit/webkit-guide/css/mqlayout_touch.css index 78ed1741c3..78ed1741c3 100755..100644 --- a/examples/webkit/webkit-guide/css/mqlayout_touch.css +++ b/examples/webkit/webkit-guide/css/mqlayout_touch.css diff --git a/examples/webkit/webkit-guide/css/storage.css b/examples/webkit/webkit-guide/css/storage.css index a1f1a13921..a1f1a13921 100755..100644 --- a/examples/webkit/webkit-guide/css/storage.css +++ b/examples/webkit/webkit-guide/css/storage.css diff --git a/examples/webkit/webkit-guide/img/border-frame.png b/examples/webkit/webkit-guide/img/border-frame.png Binary files differindex 7a0894cabc..7a0894cabc 100755..100644 --- a/examples/webkit/webkit-guide/img/border-frame.png +++ b/examples/webkit/webkit-guide/img/border-frame.png diff --git a/examples/webkit/webkit-guide/img/gradient.jpg b/examples/webkit/webkit-guide/img/gradient.jpg Binary files differindex 014386e275..014386e275 100755..100644 --- a/examples/webkit/webkit-guide/img/gradient.jpg +++ b/examples/webkit/webkit-guide/img/gradient.jpg diff --git a/examples/webkit/webkit-guide/img/gray_icon_close.png b/examples/webkit/webkit-guide/img/gray_icon_close.png Binary files differindex 8e7450153e..8e7450153e 100755..100644 --- a/examples/webkit/webkit-guide/img/gray_icon_close.png +++ b/examples/webkit/webkit-guide/img/gray_icon_close.png diff --git a/examples/webkit/webkit-guide/img/ic_ag_016.png b/examples/webkit/webkit-guide/img/ic_ag_016.png Binary files differindex bb961cb393..bb961cb393 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ag_016.png +++ b/examples/webkit/webkit-guide/img/ic_ag_016.png diff --git a/examples/webkit/webkit-guide/img/ic_ag_032.png b/examples/webkit/webkit-guide/img/ic_ag_032.png Binary files differindex edb051f50e..edb051f50e 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ag_032.png +++ b/examples/webkit/webkit-guide/img/ic_ag_032.png diff --git a/examples/webkit/webkit-guide/img/ic_ag_036.png b/examples/webkit/webkit-guide/img/ic_ag_036.png Binary files differindex e555e92071..e555e92071 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ag_036.png +++ b/examples/webkit/webkit-guide/img/ic_ag_036.png diff --git a/examples/webkit/webkit-guide/img/ic_ag_048.png b/examples/webkit/webkit-guide/img/ic_ag_048.png Binary files differindex d2d417da2e..d2d417da2e 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ag_048.png +++ b/examples/webkit/webkit-guide/img/ic_ag_048.png diff --git a/examples/webkit/webkit-guide/img/ic_al_016.png b/examples/webkit/webkit-guide/img/ic_al_016.png Binary files differindex 0f1c0240fb..0f1c0240fb 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_al_016.png +++ b/examples/webkit/webkit-guide/img/ic_al_016.png diff --git a/examples/webkit/webkit-guide/img/ic_al_032.png b/examples/webkit/webkit-guide/img/ic_al_032.png Binary files differindex 5727a5104e..5727a5104e 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_al_032.png +++ b/examples/webkit/webkit-guide/img/ic_al_032.png diff --git a/examples/webkit/webkit-guide/img/ic_al_036.png b/examples/webkit/webkit-guide/img/ic_al_036.png Binary files differindex 76382779b8..76382779b8 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_al_036.png +++ b/examples/webkit/webkit-guide/img/ic_al_036.png diff --git a/examples/webkit/webkit-guide/img/ic_al_048.png b/examples/webkit/webkit-guide/img/ic_al_048.png Binary files differindex 9671d86944..9671d86944 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_al_048.png +++ b/examples/webkit/webkit-guide/img/ic_al_048.png diff --git a/examples/webkit/webkit-guide/img/ic_ar_016.png b/examples/webkit/webkit-guide/img/ic_ar_016.png Binary files differindex fa91e96dca..fa91e96dca 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ar_016.png +++ b/examples/webkit/webkit-guide/img/ic_ar_016.png diff --git a/examples/webkit/webkit-guide/img/ic_ar_032.png b/examples/webkit/webkit-guide/img/ic_ar_032.png Binary files differindex d899c41fdb..d899c41fdb 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ar_032.png +++ b/examples/webkit/webkit-guide/img/ic_ar_032.png diff --git a/examples/webkit/webkit-guide/img/ic_ar_036.png b/examples/webkit/webkit-guide/img/ic_ar_036.png Binary files differindex 836593f4bc..836593f4bc 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ar_036.png +++ b/examples/webkit/webkit-guide/img/ic_ar_036.png diff --git a/examples/webkit/webkit-guide/img/ic_ar_048.png b/examples/webkit/webkit-guide/img/ic_ar_048.png Binary files differindex e1c77aca74..e1c77aca74 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ar_048.png +++ b/examples/webkit/webkit-guide/img/ic_ar_048.png diff --git a/examples/webkit/webkit-guide/img/ic_b_016.png b/examples/webkit/webkit-guide/img/ic_b_016.png Binary files differindex a0ebdf7964..a0ebdf7964 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_b_016.png +++ b/examples/webkit/webkit-guide/img/ic_b_016.png diff --git a/examples/webkit/webkit-guide/img/ic_b_032.png b/examples/webkit/webkit-guide/img/ic_b_032.png Binary files differindex f5571f2bb9..f5571f2bb9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_b_032.png +++ b/examples/webkit/webkit-guide/img/ic_b_032.png diff --git a/examples/webkit/webkit-guide/img/ic_b_036.png b/examples/webkit/webkit-guide/img/ic_b_036.png Binary files differindex 4aff7eb601..4aff7eb601 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_b_036.png +++ b/examples/webkit/webkit-guide/img/ic_b_036.png diff --git a/examples/webkit/webkit-guide/img/ic_b_048.png b/examples/webkit/webkit-guide/img/ic_b_048.png Binary files differindex b84434cec4..b84434cec4 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_b_048.png +++ b/examples/webkit/webkit-guide/img/ic_b_048.png diff --git a/examples/webkit/webkit-guide/img/ic_be_016.png b/examples/webkit/webkit-guide/img/ic_be_016.png Binary files differindex 0297cd827d..0297cd827d 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_be_016.png +++ b/examples/webkit/webkit-guide/img/ic_be_016.png diff --git a/examples/webkit/webkit-guide/img/ic_be_032.png b/examples/webkit/webkit-guide/img/ic_be_032.png Binary files differindex 5c5b9cd9e1..5c5b9cd9e1 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_be_032.png +++ b/examples/webkit/webkit-guide/img/ic_be_032.png diff --git a/examples/webkit/webkit-guide/img/ic_be_036.png b/examples/webkit/webkit-guide/img/ic_be_036.png Binary files differindex 96ec4bb4ca..96ec4bb4ca 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_be_036.png +++ b/examples/webkit/webkit-guide/img/ic_be_036.png diff --git a/examples/webkit/webkit-guide/img/ic_be_048.png b/examples/webkit/webkit-guide/img/ic_be_048.png Binary files differindex afcdf183dd..afcdf183dd 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_be_048.png +++ b/examples/webkit/webkit-guide/img/ic_be_048.png diff --git a/examples/webkit/webkit-guide/img/ic_c_016.png b/examples/webkit/webkit-guide/img/ic_c_016.png Binary files differindex a3cc4cfadf..a3cc4cfadf 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_c_016.png +++ b/examples/webkit/webkit-guide/img/ic_c_016.png diff --git a/examples/webkit/webkit-guide/img/ic_c_032.png b/examples/webkit/webkit-guide/img/ic_c_032.png Binary files differindex 404babecf1..404babecf1 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_c_032.png +++ b/examples/webkit/webkit-guide/img/ic_c_032.png diff --git a/examples/webkit/webkit-guide/img/ic_c_036.png b/examples/webkit/webkit-guide/img/ic_c_036.png Binary files differindex 78d71500d9..78d71500d9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_c_036.png +++ b/examples/webkit/webkit-guide/img/ic_c_036.png diff --git a/examples/webkit/webkit-guide/img/ic_c_048.png b/examples/webkit/webkit-guide/img/ic_c_048.png Binary files differindex 73462ad394..73462ad394 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_c_048.png +++ b/examples/webkit/webkit-guide/img/ic_c_048.png diff --git a/examples/webkit/webkit-guide/img/ic_ca_016.png b/examples/webkit/webkit-guide/img/ic_ca_016.png Binary files differindex af4c37b0e5..af4c37b0e5 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ca_016.png +++ b/examples/webkit/webkit-guide/img/ic_ca_016.png diff --git a/examples/webkit/webkit-guide/img/ic_ca_032.png b/examples/webkit/webkit-guide/img/ic_ca_032.png Binary files differindex 6ac8db4ce6..6ac8db4ce6 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ca_032.png +++ b/examples/webkit/webkit-guide/img/ic_ca_032.png diff --git a/examples/webkit/webkit-guide/img/ic_ca_036.png b/examples/webkit/webkit-guide/img/ic_ca_036.png Binary files differindex 19988c165d..19988c165d 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ca_036.png +++ b/examples/webkit/webkit-guide/img/ic_ca_036.png diff --git a/examples/webkit/webkit-guide/img/ic_ca_048.png b/examples/webkit/webkit-guide/img/ic_ca_048.png Binary files differindex 0349061038..0349061038 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ca_048.png +++ b/examples/webkit/webkit-guide/img/ic_ca_048.png diff --git a/examples/webkit/webkit-guide/img/ic_cl_016.png b/examples/webkit/webkit-guide/img/ic_cl_016.png Binary files differindex e9b421e70c..e9b421e70c 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cl_016.png +++ b/examples/webkit/webkit-guide/img/ic_cl_016.png diff --git a/examples/webkit/webkit-guide/img/ic_cl_032.png b/examples/webkit/webkit-guide/img/ic_cl_032.png Binary files differindex f5968d5dfe..f5968d5dfe 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cl_032.png +++ b/examples/webkit/webkit-guide/img/ic_cl_032.png diff --git a/examples/webkit/webkit-guide/img/ic_cl_036.png b/examples/webkit/webkit-guide/img/ic_cl_036.png Binary files differindex 2a6721d780..2a6721d780 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cl_036.png +++ b/examples/webkit/webkit-guide/img/ic_cl_036.png diff --git a/examples/webkit/webkit-guide/img/ic_cl_048.png b/examples/webkit/webkit-guide/img/ic_cl_048.png Binary files differindex f32981fe81..f32981fe81 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cl_048.png +++ b/examples/webkit/webkit-guide/img/ic_cl_048.png diff --git a/examples/webkit/webkit-guide/img/ic_cu_016.png b/examples/webkit/webkit-guide/img/ic_cu_016.png Binary files differindex 129f99ffd1..129f99ffd1 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cu_016.png +++ b/examples/webkit/webkit-guide/img/ic_cu_016.png diff --git a/examples/webkit/webkit-guide/img/ic_cu_032.png b/examples/webkit/webkit-guide/img/ic_cu_032.png Binary files differindex a07933ea68..a07933ea68 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cu_032.png +++ b/examples/webkit/webkit-guide/img/ic_cu_032.png diff --git a/examples/webkit/webkit-guide/img/ic_cu_036.png b/examples/webkit/webkit-guide/img/ic_cu_036.png Binary files differindex 5eb6ed6363..5eb6ed6363 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cu_036.png +++ b/examples/webkit/webkit-guide/img/ic_cu_036.png diff --git a/examples/webkit/webkit-guide/img/ic_cu_048.png b/examples/webkit/webkit-guide/img/ic_cu_048.png Binary files differindex f21593cf78..f21593cf78 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_cu_048.png +++ b/examples/webkit/webkit-guide/img/ic_cu_048.png diff --git a/examples/webkit/webkit-guide/img/ic_f_016.png b/examples/webkit/webkit-guide/img/ic_f_016.png Binary files differindex ff2e3fb5f4..ff2e3fb5f4 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_f_016.png +++ b/examples/webkit/webkit-guide/img/ic_f_016.png diff --git a/examples/webkit/webkit-guide/img/ic_f_032.png b/examples/webkit/webkit-guide/img/ic_f_032.png Binary files differindex 3424799317..3424799317 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_f_032.png +++ b/examples/webkit/webkit-guide/img/ic_f_032.png diff --git a/examples/webkit/webkit-guide/img/ic_f_036.png b/examples/webkit/webkit-guide/img/ic_f_036.png Binary files differindex 019b7032a6..019b7032a6 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_f_036.png +++ b/examples/webkit/webkit-guide/img/ic_f_036.png diff --git a/examples/webkit/webkit-guide/img/ic_f_048.png b/examples/webkit/webkit-guide/img/ic_f_048.png Binary files differindex 567d30310a..567d30310a 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_f_048.png +++ b/examples/webkit/webkit-guide/img/ic_f_048.png diff --git a/examples/webkit/webkit-guide/img/ic_fe_016.png b/examples/webkit/webkit-guide/img/ic_fe_016.png Binary files differindex e6d9b829b9..e6d9b829b9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_fe_016.png +++ b/examples/webkit/webkit-guide/img/ic_fe_016.png diff --git a/examples/webkit/webkit-guide/img/ic_fe_032.png b/examples/webkit/webkit-guide/img/ic_fe_032.png Binary files differindex f2b4e4b417..f2b4e4b417 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_fe_032.png +++ b/examples/webkit/webkit-guide/img/ic_fe_032.png diff --git a/examples/webkit/webkit-guide/img/ic_fe_036.png b/examples/webkit/webkit-guide/img/ic_fe_036.png Binary files differindex 2aa81b5fec..2aa81b5fec 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_fe_036.png +++ b/examples/webkit/webkit-guide/img/ic_fe_036.png diff --git a/examples/webkit/webkit-guide/img/ic_fe_048.png b/examples/webkit/webkit-guide/img/ic_fe_048.png Binary files differindex b6914735d9..b6914735d9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_fe_048.png +++ b/examples/webkit/webkit-guide/img/ic_fe_048.png diff --git a/examples/webkit/webkit-guide/img/ic_h_016.png b/examples/webkit/webkit-guide/img/ic_h_016.png Binary files differindex 957a1ffabe..957a1ffabe 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_h_016.png +++ b/examples/webkit/webkit-guide/img/ic_h_016.png diff --git a/examples/webkit/webkit-guide/img/ic_h_032.png b/examples/webkit/webkit-guide/img/ic_h_032.png Binary files differindex 824620d4a2..824620d4a2 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_h_032.png +++ b/examples/webkit/webkit-guide/img/ic_h_032.png diff --git a/examples/webkit/webkit-guide/img/ic_h_036.png b/examples/webkit/webkit-guide/img/ic_h_036.png Binary files differindex fba59a5d27..fba59a5d27 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_h_036.png +++ b/examples/webkit/webkit-guide/img/ic_h_036.png diff --git a/examples/webkit/webkit-guide/img/ic_h_048.png b/examples/webkit/webkit-guide/img/ic_h_048.png Binary files differindex f75822c3aa..f75822c3aa 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_h_048.png +++ b/examples/webkit/webkit-guide/img/ic_h_048.png diff --git a/examples/webkit/webkit-guide/img/ic_he_016.png b/examples/webkit/webkit-guide/img/ic_he_016.png Binary files differindex 33fe83677f..33fe83677f 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_he_016.png +++ b/examples/webkit/webkit-guide/img/ic_he_016.png diff --git a/examples/webkit/webkit-guide/img/ic_he_032.png b/examples/webkit/webkit-guide/img/ic_he_032.png Binary files differindex 425c525b69..425c525b69 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_he_032.png +++ b/examples/webkit/webkit-guide/img/ic_he_032.png diff --git a/examples/webkit/webkit-guide/img/ic_he_036.png b/examples/webkit/webkit-guide/img/ic_he_036.png Binary files differindex a976aece8b..a976aece8b 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_he_036.png +++ b/examples/webkit/webkit-guide/img/ic_he_036.png diff --git a/examples/webkit/webkit-guide/img/ic_he_048.png b/examples/webkit/webkit-guide/img/ic_he_048.png Binary files differindex f8f9d4d853..f8f9d4d853 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_he_048.png +++ b/examples/webkit/webkit-guide/img/ic_he_048.png diff --git a/examples/webkit/webkit-guide/img/ic_k_016.png b/examples/webkit/webkit-guide/img/ic_k_016.png Binary files differindex 860bd62f96..860bd62f96 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_k_016.png +++ b/examples/webkit/webkit-guide/img/ic_k_016.png diff --git a/examples/webkit/webkit-guide/img/ic_k_032.png b/examples/webkit/webkit-guide/img/ic_k_032.png Binary files differindex a14f2c65e9..a14f2c65e9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_k_032.png +++ b/examples/webkit/webkit-guide/img/ic_k_032.png diff --git a/examples/webkit/webkit-guide/img/ic_k_036.png b/examples/webkit/webkit-guide/img/ic_k_036.png Binary files differindex 49f19e6df0..49f19e6df0 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_k_036.png +++ b/examples/webkit/webkit-guide/img/ic_k_036.png diff --git a/examples/webkit/webkit-guide/img/ic_k_048.png b/examples/webkit/webkit-guide/img/ic_k_048.png Binary files differindex a7515cd782..a7515cd782 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_k_048.png +++ b/examples/webkit/webkit-guide/img/ic_k_048.png diff --git a/examples/webkit/webkit-guide/img/ic_li_016.png b/examples/webkit/webkit-guide/img/ic_li_016.png Binary files differindex c16d81a4bc..c16d81a4bc 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_li_016.png +++ b/examples/webkit/webkit-guide/img/ic_li_016.png diff --git a/examples/webkit/webkit-guide/img/ic_li_032.png b/examples/webkit/webkit-guide/img/ic_li_032.png Binary files differindex 3a34f37066..3a34f37066 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_li_032.png +++ b/examples/webkit/webkit-guide/img/ic_li_032.png diff --git a/examples/webkit/webkit-guide/img/ic_li_036.png b/examples/webkit/webkit-guide/img/ic_li_036.png Binary files differindex e5b97a7a2e..e5b97a7a2e 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_li_036.png +++ b/examples/webkit/webkit-guide/img/ic_li_036.png diff --git a/examples/webkit/webkit-guide/img/ic_li_048.png b/examples/webkit/webkit-guide/img/ic_li_048.png Binary files differindex 7b030e4cd7..7b030e4cd7 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_li_048.png +++ b/examples/webkit/webkit-guide/img/ic_li_048.png diff --git a/examples/webkit/webkit-guide/img/ic_mg_016.png b/examples/webkit/webkit-guide/img/ic_mg_016.png Binary files differindex 2606336415..2606336415 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_mg_016.png +++ b/examples/webkit/webkit-guide/img/ic_mg_016.png diff --git a/examples/webkit/webkit-guide/img/ic_mg_032.png b/examples/webkit/webkit-guide/img/ic_mg_032.png Binary files differindex 2f9d03e6b0..2f9d03e6b0 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_mg_032.png +++ b/examples/webkit/webkit-guide/img/ic_mg_032.png diff --git a/examples/webkit/webkit-guide/img/ic_mg_036.png b/examples/webkit/webkit-guide/img/ic_mg_036.png Binary files differindex 584078db84..584078db84 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_mg_036.png +++ b/examples/webkit/webkit-guide/img/ic_mg_036.png diff --git a/examples/webkit/webkit-guide/img/ic_mg_048.png b/examples/webkit/webkit-guide/img/ic_mg_048.png Binary files differindex 8cd2f3acc7..8cd2f3acc7 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_mg_048.png +++ b/examples/webkit/webkit-guide/img/ic_mg_048.png diff --git a/examples/webkit/webkit-guide/img/ic_n_016.png b/examples/webkit/webkit-guide/img/ic_n_016.png Binary files differindex 90e8f9fec9..90e8f9fec9 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_n_016.png +++ b/examples/webkit/webkit-guide/img/ic_n_016.png diff --git a/examples/webkit/webkit-guide/img/ic_n_032.png b/examples/webkit/webkit-guide/img/ic_n_032.png Binary files differindex afeb47a105..afeb47a105 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_n_032.png +++ b/examples/webkit/webkit-guide/img/ic_n_032.png diff --git a/examples/webkit/webkit-guide/img/ic_n_036.png b/examples/webkit/webkit-guide/img/ic_n_036.png Binary files differindex 0b7a11deed..0b7a11deed 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_n_036.png +++ b/examples/webkit/webkit-guide/img/ic_n_036.png diff --git a/examples/webkit/webkit-guide/img/ic_n_048.png b/examples/webkit/webkit-guide/img/ic_n_048.png Binary files differindex c0d7c0699e..c0d7c0699e 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_n_048.png +++ b/examples/webkit/webkit-guide/img/ic_n_048.png diff --git a/examples/webkit/webkit-guide/img/ic_na_016.png b/examples/webkit/webkit-guide/img/ic_na_016.png Binary files differindex 7888d0f9c0..7888d0f9c0 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_na_016.png +++ b/examples/webkit/webkit-guide/img/ic_na_016.png diff --git a/examples/webkit/webkit-guide/img/ic_na_032.png b/examples/webkit/webkit-guide/img/ic_na_032.png Binary files differindex 801ddca50b..801ddca50b 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_na_032.png +++ b/examples/webkit/webkit-guide/img/ic_na_032.png diff --git a/examples/webkit/webkit-guide/img/ic_na_036.png b/examples/webkit/webkit-guide/img/ic_na_036.png Binary files differindex a6878d45d7..a6878d45d7 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_na_036.png +++ b/examples/webkit/webkit-guide/img/ic_na_036.png diff --git a/examples/webkit/webkit-guide/img/ic_na_048.png b/examples/webkit/webkit-guide/img/ic_na_048.png Binary files differindex 76adaf479c..76adaf479c 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_na_048.png +++ b/examples/webkit/webkit-guide/img/ic_na_048.png diff --git a/examples/webkit/webkit-guide/img/ic_ne_016.png b/examples/webkit/webkit-guide/img/ic_ne_016.png Binary files differindex 64562fc2d5..64562fc2d5 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ne_016.png +++ b/examples/webkit/webkit-guide/img/ic_ne_016.png diff --git a/examples/webkit/webkit-guide/img/ic_ne_032.png b/examples/webkit/webkit-guide/img/ic_ne_032.png Binary files differindex fab5cd8fcb..fab5cd8fcb 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ne_032.png +++ b/examples/webkit/webkit-guide/img/ic_ne_032.png diff --git a/examples/webkit/webkit-guide/img/ic_ne_036.png b/examples/webkit/webkit-guide/img/ic_ne_036.png Binary files differindex 41092bf3e7..41092bf3e7 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ne_036.png +++ b/examples/webkit/webkit-guide/img/ic_ne_036.png diff --git a/examples/webkit/webkit-guide/img/ic_ne_048.png b/examples/webkit/webkit-guide/img/ic_ne_048.png Binary files differindex 4ec0db0806..4ec0db0806 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ne_048.png +++ b/examples/webkit/webkit-guide/img/ic_ne_048.png diff --git a/examples/webkit/webkit-guide/img/ic_ni_016.png b/examples/webkit/webkit-guide/img/ic_ni_016.png Binary files differindex 9b88e368a2..9b88e368a2 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ni_016.png +++ b/examples/webkit/webkit-guide/img/ic_ni_016.png diff --git a/examples/webkit/webkit-guide/img/ic_ni_032.png b/examples/webkit/webkit-guide/img/ic_ni_032.png Binary files differindex fc4fcf3ebc..fc4fcf3ebc 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ni_032.png +++ b/examples/webkit/webkit-guide/img/ic_ni_032.png diff --git a/examples/webkit/webkit-guide/img/ic_ni_036.png b/examples/webkit/webkit-guide/img/ic_ni_036.png Binary files differindex 9d527470bb..9d527470bb 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ni_036.png +++ b/examples/webkit/webkit-guide/img/ic_ni_036.png diff --git a/examples/webkit/webkit-guide/img/ic_ni_048.png b/examples/webkit/webkit-guide/img/ic_ni_048.png Binary files differindex b563c50361..b563c50361 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_ni_048.png +++ b/examples/webkit/webkit-guide/img/ic_ni_048.png diff --git a/examples/webkit/webkit-guide/img/ic_o_016.png b/examples/webkit/webkit-guide/img/ic_o_016.png Binary files differindex a95460d457..a95460d457 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_o_016.png +++ b/examples/webkit/webkit-guide/img/ic_o_016.png diff --git a/examples/webkit/webkit-guide/img/ic_o_032.png b/examples/webkit/webkit-guide/img/ic_o_032.png Binary files differindex 1d4864dded..1d4864dded 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_o_032.png +++ b/examples/webkit/webkit-guide/img/ic_o_032.png diff --git a/examples/webkit/webkit-guide/img/ic_o_036.png b/examples/webkit/webkit-guide/img/ic_o_036.png Binary files differindex 7f5dd02ed2..7f5dd02ed2 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_o_036.png +++ b/examples/webkit/webkit-guide/img/ic_o_036.png diff --git a/examples/webkit/webkit-guide/img/ic_o_048.png b/examples/webkit/webkit-guide/img/ic_o_048.png Binary files differindex 7461a8e9e4..7461a8e9e4 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_o_048.png +++ b/examples/webkit/webkit-guide/img/ic_o_048.png diff --git a/examples/webkit/webkit-guide/img/ic_pt_016.png b/examples/webkit/webkit-guide/img/ic_pt_016.png Binary files differindex 513eb97a30..513eb97a30 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_pt_016.png +++ b/examples/webkit/webkit-guide/img/ic_pt_016.png diff --git a/examples/webkit/webkit-guide/img/ic_pt_032.png b/examples/webkit/webkit-guide/img/ic_pt_032.png Binary files differindex 1550c399c8..1550c399c8 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_pt_032.png +++ b/examples/webkit/webkit-guide/img/ic_pt_032.png diff --git a/examples/webkit/webkit-guide/img/ic_pt_036.png b/examples/webkit/webkit-guide/img/ic_pt_036.png Binary files differindex 7eec4d0ce4..7eec4d0ce4 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_pt_036.png +++ b/examples/webkit/webkit-guide/img/ic_pt_036.png diff --git a/examples/webkit/webkit-guide/img/ic_pt_048.png b/examples/webkit/webkit-guide/img/ic_pt_048.png Binary files differindex 50dece6610..50dece6610 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_pt_048.png +++ b/examples/webkit/webkit-guide/img/ic_pt_048.png diff --git a/examples/webkit/webkit-guide/img/ic_si_016.png b/examples/webkit/webkit-guide/img/ic_si_016.png Binary files differindex e639b683ae..e639b683ae 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_si_016.png +++ b/examples/webkit/webkit-guide/img/ic_si_016.png diff --git a/examples/webkit/webkit-guide/img/ic_si_032.png b/examples/webkit/webkit-guide/img/ic_si_032.png Binary files differindex 8657e6276f..8657e6276f 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_si_032.png +++ b/examples/webkit/webkit-guide/img/ic_si_032.png diff --git a/examples/webkit/webkit-guide/img/ic_si_036.png b/examples/webkit/webkit-guide/img/ic_si_036.png Binary files differindex ffe0ee27fc..ffe0ee27fc 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_si_036.png +++ b/examples/webkit/webkit-guide/img/ic_si_036.png diff --git a/examples/webkit/webkit-guide/img/ic_si_048.png b/examples/webkit/webkit-guide/img/ic_si_048.png Binary files differindex 5b9400dbdc..5b9400dbdc 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_si_048.png +++ b/examples/webkit/webkit-guide/img/ic_si_048.png diff --git a/examples/webkit/webkit-guide/img/ic_zn_016.png b/examples/webkit/webkit-guide/img/ic_zn_016.png Binary files differindex 11e5705130..11e5705130 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_zn_016.png +++ b/examples/webkit/webkit-guide/img/ic_zn_016.png diff --git a/examples/webkit/webkit-guide/img/ic_zn_032.png b/examples/webkit/webkit-guide/img/ic_zn_032.png Binary files differindex cb78a5c139..cb78a5c139 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_zn_032.png +++ b/examples/webkit/webkit-guide/img/ic_zn_032.png diff --git a/examples/webkit/webkit-guide/img/ic_zn_036.png b/examples/webkit/webkit-guide/img/ic_zn_036.png Binary files differindex 66abffd40d..66abffd40d 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_zn_036.png +++ b/examples/webkit/webkit-guide/img/ic_zn_036.png diff --git a/examples/webkit/webkit-guide/img/ic_zn_048.png b/examples/webkit/webkit-guide/img/ic_zn_048.png Binary files differindex d8361ad6c0..d8361ad6c0 100755..100644 --- a/examples/webkit/webkit-guide/img/ic_zn_048.png +++ b/examples/webkit/webkit-guide/img/ic_zn_048.png diff --git a/examples/webkit/webkit-guide/img/icon_check.png b/examples/webkit/webkit-guide/img/icon_check.png Binary files differindex 294b62d24d..294b62d24d 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_check.png +++ b/examples/webkit/webkit-guide/img/icon_check.png diff --git a/examples/webkit/webkit-guide/img/icon_check_x24green.png b/examples/webkit/webkit-guide/img/icon_check_x24green.png Binary files differindex 803928c231..803928c231 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_check_x24green.png +++ b/examples/webkit/webkit-guide/img/icon_check_x24green.png diff --git a/examples/webkit/webkit-guide/img/icon_dismiss.png b/examples/webkit/webkit-guide/img/icon_dismiss.png Binary files differindex e7a842640a..e7a842640a 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_dismiss.png +++ b/examples/webkit/webkit-guide/img/icon_dismiss.png diff --git a/examples/webkit/webkit-guide/img/icon_dismiss_x22.png b/examples/webkit/webkit-guide/img/icon_dismiss_x22.png Binary files differindex e52a62a598..e52a62a598 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_dismiss_x22.png +++ b/examples/webkit/webkit-guide/img/icon_dismiss_x22.png diff --git a/examples/webkit/webkit-guide/img/icon_drill-down.png b/examples/webkit/webkit-guide/img/icon_drill-down.png Binary files differindex 7928c6e59e..7928c6e59e 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_drill-down.png +++ b/examples/webkit/webkit-guide/img/icon_drill-down.png diff --git a/examples/webkit/webkit-guide/img/icon_drill-down_x32.png b/examples/webkit/webkit-guide/img/icon_drill-down_x32.png Binary files differindex 477d7cda0d..477d7cda0d 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_drill-down_x32.png +++ b/examples/webkit/webkit-guide/img/icon_drill-down_x32.png diff --git a/examples/webkit/webkit-guide/img/icon_drill-up.png b/examples/webkit/webkit-guide/img/icon_drill-up.png Binary files differindex ff7594054d..ff7594054d 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_drill-up.png +++ b/examples/webkit/webkit-guide/img/icon_drill-up.png diff --git a/examples/webkit/webkit-guide/img/icon_drill-up_x32.png b/examples/webkit/webkit-guide/img/icon_drill-up_x32.png Binary files differindex d63fe083a1..d63fe083a1 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_drill-up_x32.png +++ b/examples/webkit/webkit-guide/img/icon_drill-up_x32.png diff --git a/examples/webkit/webkit-guide/img/icon_expand-nav.png b/examples/webkit/webkit-guide/img/icon_expand-nav.png Binary files differindex 7ec5aa68d1..7ec5aa68d1 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_expand-nav.png +++ b/examples/webkit/webkit-guide/img/icon_expand-nav.png diff --git a/examples/webkit/webkit-guide/img/icon_head-collapsed.png b/examples/webkit/webkit-guide/img/icon_head-collapsed.png Binary files differindex ed47838b5b..ed47838b5b 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_head-collapsed.png +++ b/examples/webkit/webkit-guide/img/icon_head-collapsed.png diff --git a/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png b/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png Binary files differindex 6892dc08a6..6892dc08a6 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png +++ b/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png diff --git a/examples/webkit/webkit-guide/img/icon_head-expanded.png b/examples/webkit/webkit-guide/img/icon_head-expanded.png Binary files differindex ee7e0a767a..ee7e0a767a 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_head-expanded.png +++ b/examples/webkit/webkit-guide/img/icon_head-expanded.png diff --git a/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png b/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png Binary files differindex 40e8eeb4c1..40e8eeb4c1 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png +++ b/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png diff --git a/examples/webkit/webkit-guide/img/icon_info.png b/examples/webkit/webkit-guide/img/icon_info.png Binary files differindex b70c760621..b70c760621 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_info.png +++ b/examples/webkit/webkit-guide/img/icon_info.png diff --git a/examples/webkit/webkit-guide/img/icon_info_x24.png b/examples/webkit/webkit-guide/img/icon_info_x24.png Binary files differindex 9f4f352c84..9f4f352c84 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_info_x24.png +++ b/examples/webkit/webkit-guide/img/icon_info_x24.png diff --git a/examples/webkit/webkit-guide/img/icon_link-doc.png b/examples/webkit/webkit-guide/img/icon_link-doc.png Binary files differindex fc9bd54e06..fc9bd54e06 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-doc.png +++ b/examples/webkit/webkit-guide/img/icon_link-doc.png diff --git a/examples/webkit/webkit-guide/img/icon_link-email.png b/examples/webkit/webkit-guide/img/icon_link-email.png Binary files differindex ef5f95d318..ef5f95d318 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-email.png +++ b/examples/webkit/webkit-guide/img/icon_link-email.png diff --git a/examples/webkit/webkit-guide/img/icon_link-external.png b/examples/webkit/webkit-guide/img/icon_link-external.png Binary files differindex 47ddd807e4..47ddd807e4 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-external.png +++ b/examples/webkit/webkit-guide/img/icon_link-external.png diff --git a/examples/webkit/webkit-guide/img/icon_link-pdf.png b/examples/webkit/webkit-guide/img/icon_link-pdf.png Binary files differindex fb90a6a2b9..fb90a6a2b9 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-pdf.png +++ b/examples/webkit/webkit-guide/img/icon_link-pdf.png diff --git a/examples/webkit/webkit-guide/img/icon_link-ppt.png b/examples/webkit/webkit-guide/img/icon_link-ppt.png Binary files differindex c6a532878c..c6a532878c 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-ppt.png +++ b/examples/webkit/webkit-guide/img/icon_link-ppt.png diff --git a/examples/webkit/webkit-guide/img/icon_link-rss.png b/examples/webkit/webkit-guide/img/icon_link-rss.png Binary files differindex d3cf2c4916..d3cf2c4916 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-rss.png +++ b/examples/webkit/webkit-guide/img/icon_link-rss.png diff --git a/examples/webkit/webkit-guide/img/icon_link-sms.png b/examples/webkit/webkit-guide/img/icon_link-sms.png Binary files differindex f36de100f8..f36de100f8 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-sms.png +++ b/examples/webkit/webkit-guide/img/icon_link-sms.png diff --git a/examples/webkit/webkit-guide/img/icon_link-tel.png b/examples/webkit/webkit-guide/img/icon_link-tel.png Binary files differindex 7b665ee5de..7b665ee5de 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-tel.png +++ b/examples/webkit/webkit-guide/img/icon_link-tel.png diff --git a/examples/webkit/webkit-guide/img/icon_link-xls.png b/examples/webkit/webkit-guide/img/icon_link-xls.png Binary files differindex 977c868eae..977c868eae 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_link-xls.png +++ b/examples/webkit/webkit-guide/img/icon_link-xls.png diff --git a/examples/webkit/webkit-guide/img/icon_list-all.png b/examples/webkit/webkit-guide/img/icon_list-all.png Binary files differindex 97ce879fb8..97ce879fb8 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_list-all.png +++ b/examples/webkit/webkit-guide/img/icon_list-all.png diff --git a/examples/webkit/webkit-guide/img/icon_list-all_circ.png b/examples/webkit/webkit-guide/img/icon_list-all_circ.png Binary files differindex 6c5828e835..6c5828e835 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_list-all_circ.png +++ b/examples/webkit/webkit-guide/img/icon_list-all_circ.png diff --git a/examples/webkit/webkit-guide/img/icon_nav-start.png b/examples/webkit/webkit-guide/img/icon_nav-start.png Binary files differindex cbe127fdc9..cbe127fdc9 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_nav-start.png +++ b/examples/webkit/webkit-guide/img/icon_nav-start.png diff --git a/examples/webkit/webkit-guide/img/icon_nav-top.png b/examples/webkit/webkit-guide/img/icon_nav-top.png Binary files differindex d57d3efa11..d57d3efa11 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_nav-top.png +++ b/examples/webkit/webkit-guide/img/icon_nav-top.png diff --git a/examples/webkit/webkit-guide/img/icon_nav-up.png b/examples/webkit/webkit-guide/img/icon_nav-up.png Binary files differindex bab32593e3..bab32593e3 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_nav-up.png +++ b/examples/webkit/webkit-guide/img/icon_nav-up.png diff --git a/examples/webkit/webkit-guide/img/icon_nav_end.png b/examples/webkit/webkit-guide/img/icon_nav_end.png Binary files differindex 6d7dd319b4..6d7dd319b4 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_nav_end.png +++ b/examples/webkit/webkit-guide/img/icon_nav_end.png diff --git a/examples/webkit/webkit-guide/img/icon_question.png b/examples/webkit/webkit-guide/img/icon_question.png Binary files differindex 28c2ae1f12..28c2ae1f12 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_question.png +++ b/examples/webkit/webkit-guide/img/icon_question.png diff --git a/examples/webkit/webkit-guide/img/icon_scroll-left.png b/examples/webkit/webkit-guide/img/icon_scroll-left.png Binary files differindex 38b3c3fa0e..38b3c3fa0e 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_scroll-left.png +++ b/examples/webkit/webkit-guide/img/icon_scroll-left.png diff --git a/examples/webkit/webkit-guide/img/icon_scroll-right.png b/examples/webkit/webkit-guide/img/icon_scroll-right.png Binary files differindex 4d6191942b..4d6191942b 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_scroll-right.png +++ b/examples/webkit/webkit-guide/img/icon_scroll-right.png diff --git a/examples/webkit/webkit-guide/img/icon_trash.png b/examples/webkit/webkit-guide/img/icon_trash.png Binary files differindex b5f6eaae73..b5f6eaae73 100755..100644 --- a/examples/webkit/webkit-guide/img/icon_trash.png +++ b/examples/webkit/webkit-guide/img/icon_trash.png diff --git a/examples/webkit/webkit-guide/img/mask.png b/examples/webkit/webkit-guide/img/mask.png Binary files differindex f9764b54aa..f9764b54aa 100755..100644 --- a/examples/webkit/webkit-guide/img/mask.png +++ b/examples/webkit/webkit-guide/img/mask.png diff --git a/examples/webkit/webkit-guide/js/anim_accord.js b/examples/webkit/webkit-guide/js/anim_accord.js index 8d58a18c7e..8d58a18c7e 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_accord.js +++ b/examples/webkit/webkit-guide/js/anim_accord.js diff --git a/examples/webkit/webkit-guide/js/anim_gallery.js b/examples/webkit/webkit-guide/js/anim_gallery.js index 3e00bc6f30..3e00bc6f30 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_gallery.js +++ b/examples/webkit/webkit-guide/js/anim_gallery.js diff --git a/examples/webkit/webkit-guide/js/anim_panel.js b/examples/webkit/webkit-guide/js/anim_panel.js index 365210d84a..365210d84a 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_panel.js +++ b/examples/webkit/webkit-guide/js/anim_panel.js diff --git a/examples/webkit/webkit-guide/js/anim_skew.js b/examples/webkit/webkit-guide/js/anim_skew.js index 1a80a6d7a8..1a80a6d7a8 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_skew.js +++ b/examples/webkit/webkit-guide/js/anim_skew.js diff --git a/examples/webkit/webkit-guide/js/css3_backgrounds.js b/examples/webkit/webkit-guide/js/css3_backgrounds.js index 0c834d1dc8..0c834d1dc8 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_backgrounds.js +++ b/examples/webkit/webkit-guide/js/css3_backgrounds.js diff --git a/examples/webkit/webkit-guide/js/css3_border-img.js b/examples/webkit/webkit-guide/js/css3_border-img.js index b440afbfb5..b440afbfb5 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_border-img.js +++ b/examples/webkit/webkit-guide/js/css3_border-img.js diff --git a/examples/webkit/webkit-guide/js/css3_grad-radial.js b/examples/webkit/webkit-guide/js/css3_grad-radial.js index 46601e4d69..46601e4d69 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_grad-radial.js +++ b/examples/webkit/webkit-guide/js/css3_grad-radial.js diff --git a/examples/webkit/webkit-guide/js/css3_mask-grad.js b/examples/webkit/webkit-guide/js/css3_mask-grad.js index 5d516aa93c..5d516aa93c 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_mask-grad.js +++ b/examples/webkit/webkit-guide/js/css3_mask-grad.js diff --git a/examples/webkit/webkit-guide/js/css3_mask-img.js b/examples/webkit/webkit-guide/js/css3_mask-img.js index b440afbfb5..b440afbfb5 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_mask-img.js +++ b/examples/webkit/webkit-guide/js/css3_mask-img.js diff --git a/examples/webkit/webkit-guide/js/css3_text-overflow.js b/examples/webkit/webkit-guide/js/css3_text-overflow.js index 1a87cb3c83..1a87cb3c83 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_text-overflow.js +++ b/examples/webkit/webkit-guide/js/css3_text-overflow.js diff --git a/examples/webkit/webkit-guide/js/form_tapper.js b/examples/webkit/webkit-guide/js/form_tapper.js index bb0c9dca19..bb0c9dca19 100755..100644 --- a/examples/webkit/webkit-guide/js/form_tapper.js +++ b/examples/webkit/webkit-guide/js/form_tapper.js diff --git a/examples/webkit/webkit-guide/js/mob_condjs.js b/examples/webkit/webkit-guide/js/mob_condjs.js index 1ba445e4b2..1ba445e4b2 100755..100644 --- a/examples/webkit/webkit-guide/js/mob_condjs.js +++ b/examples/webkit/webkit-guide/js/mob_condjs.js diff --git a/examples/webkit/webkit-guide/js/mobile.js b/examples/webkit/webkit-guide/js/mobile.js index 880d6e45bc..880d6e45bc 100755..100644 --- a/examples/webkit/webkit-guide/js/mobile.js +++ b/examples/webkit/webkit-guide/js/mobile.js diff --git a/examples/webkit/webkit-guide/js/storage.js b/examples/webkit/webkit-guide/js/storage.js index 62dca84808..62dca84808 100755..100644 --- a/examples/webkit/webkit-guide/js/storage.js +++ b/examples/webkit/webkit-guide/js/storage.js diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app index 393b615475..393b615475 100755..100644 --- a/mkspecs/macx-pbuilder/Info.plist.app +++ b/mkspecs/macx-pbuilder/Info.plist.app diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 2418c7c6f3..2418c7c6f3 100755..100644 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf diff --git a/mkspecs/macx-xcode/Info.plist.app b/mkspecs/macx-xcode/Info.plist.app index 393b615475..393b615475 100755..100644 --- a/mkspecs/macx-xcode/Info.plist.app +++ b/mkspecs/macx-xcode/Info.plist.app diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 4cb462696e..4cb462696e 100755..100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog index ead97bd553..ead97bd553 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 3d9cb9d57e..3d9cb9d57e 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 5563e26950..5563e26950 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 5e2acd2c68..5e2acd2c68 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 406243586d..406243586d 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 e00443d02c..e00443d02c 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 a8aba5c503..a8aba5c503 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 6b86232dea..6b86232dea 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 7d6af6c2b6..7d6af6c2b6 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 14bde38ab6..14bde38ab6 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 e88fd8930e..e88fd8930e 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 de2072a9a3..de2072a9a3 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 f96be0b31f..f96be0b31f 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 1319cdf346..1319cdf346 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 d0f9cb4a20..d0f9cb4a20 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 61fa2f710a..61fa2f710a 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 4b339ca97d..4b339ca97d 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 8ad44f8559..8ad44f8559 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 0693eb0c4c..0693eb0c4c 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 fdad347e72..fdad347e72 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 b7fdc159d8..b7fdc159d8 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 Binary files differindex d04df37e08..d04df37e08 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 Binary files differindex e824a21653..e824a21653 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 Binary files differindex 01ce6929f3..01ce6929f3 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 Binary files differindex b98fb36981..b98fb36981 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 Binary files differindex 035aeb27fc..035aeb27fc 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png +++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp index d9bb5b5ead..4103552db1 100644 --- a/src/dbus/qdbusdemarshaller.cpp +++ b/src/dbus/qdbusdemarshaller.cpp @@ -48,10 +48,28 @@ QT_BEGIN_NAMESPACE template <typename T> static inline T qIterGet(DBusMessageIter *it) { - T t; - q_dbus_message_iter_get_basic(it, &t); + // Use a union of expected and largest type q_dbus_message_iter_get_basic + // will return to ensure reading the wrong basic type does not result in + // stack overwrite + union { + // The value to be extracted + T t; + // Largest type that q_dbus_message_iter_get_basic will return + // according to dbus_message_iter_get_basic API documentation + dbus_uint64_t maxValue; + // A pointer to ensure no stack overwrite in case there is a platform + // where sizeof(void*) > sizeof(dbus_uint64_t) + void* ptr; + } value; + + // Initialize the value in case a narrower type is extracted to it. + // Note that the result of extracting a narrower type in place of a wider + // one and vice-versa will be platform-dependent. + value.t = T(); + + q_dbus_message_iter_get_basic(it, &value); q_dbus_message_iter_next(it); - return t; + return value.t; } QDBusDemarshaller::~QDBusDemarshaller() diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index 0631df80dd..5a2d051a26 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -133,15 +133,81 @@ void QGraphicsLayoutItemPrivate::init() /*! \internal + + effectiveSizeHint has a quirky behavior, one of the quirkinesses is when the hfw function is + combined with user-specified min/max sizes. The input to hfw function (e.g width) must be within + the min/max width constraint, and the output must be within the min/max height. This sets up a + loose dependency between minimum width and maximum height (or minimum height, depending on the + type of hfw function). Note that its only the concrete subclass that implements that hfw + function that knows if this dependency means that the height will increase or decrease when the + width is increased. + + The application should try to ensure that the user-defined sizes are within the range so that + they don't conflict with the hfw function. + + Suppose, for instance that the hfw function is: + + height = 2000/width + + and the item has these user-defined sizes: + + min ( 5, 5) + pref(100, 10) + max (500,100) + + what is the return value if one calls item->effectiveSizeHint(Qt::MinimumSize, QSizeF(10, -1)); ? + The sizeHint() function would return QSizeF(10, 200), but it would be bounded down to 100 due + to the max value, so it would return (10, 100). This is not what the item expects, since it + really wants that its hfw is respected. If this is a label with wrapped text, this would most + likely lead to that some text is clipped. This is certainly not what the app developer wants. + Now, it would be better if the user changed those constraints to match the hfw function: + + min ( 20, 5) + pref(100, 10) + max (500,100) + + here, it says that the width cannot be smaller than 20. This is because if it becomes smaller + than 20 the result of the hfw function would violate the max height (100). + + However, there is a similar problem if the width passed to the hfw function reaches *max* width: + + the sizeHint() function would now return QSizeF(500, 4), but 4 is smaller than the minimum + height (5), so effectiveSizeHint() would return (500, 5), which would leave too much space. + In this case, setting the max width to 400 fixes the problem: + + min ( 20, 5) + pref(100, 10) + max (400,100) + + + The implementor of a hfw widget must be aware of this when sizeHint() is reimplemented, so that + the default min and max sizes works sensible. (unfortunately the implementor does not have the + control over user-set values). + */ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) const { Q_Q(const QGraphicsLayoutItem); QSizeF *sizeHintCache; const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0; + QSizeF adjustedConstraint = constraint; if (hasConstraint) { if (!sizeHintWithConstraintCacheDirty && constraint == cachedConstraint) return cachedSizeHintsWithConstraints; + + const QSizeF *hintsWithoutConstraint = effectiveSizeHints(QSizeF(-1,-1)); + + if (adjustedConstraint.width() >= 0) + adjustedConstraint.setWidth( qBound( hintsWithoutConstraint[Qt::MinimumSize].width(), + adjustedConstraint.width(), + hintsWithoutConstraint[Qt::MaximumSize].width())); + if (adjustedConstraint.height() >= 0) + adjustedConstraint.setHeight( qBound( hintsWithoutConstraint[Qt::MinimumSize].height(), + adjustedConstraint.height(), + hintsWithoutConstraint[Qt::MaximumSize].height())); + + if (!sizeHintWithConstraintCacheDirty && adjustedConstraint == cachedConstraint) + return cachedSizeHintsWithConstraints; sizeHintCache = cachedSizeHintsWithConstraints; } else { if (!sizeHintCacheDirty) @@ -150,7 +216,7 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) } for (int i = 0; i < Qt::NSizeHints; ++i) { - sizeHintCache[i] = constraint; + sizeHintCache[i] = adjustedConstraint; if (userSizeHints) combineSize(sizeHintCache[i], userSizeHints[i]); } @@ -185,7 +251,7 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) // COMBINE_SIZE(descentS, q->sizeHint(Qt::MinimumDescent, constraint)); if (hasConstraint) { - cachedConstraint = constraint; + cachedConstraint = adjustedConstraint; sizeHintWithConstraintCacheDirty = false; } else { sizeHintCacheDirty = false; diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index 868cd92efb..1fbf69ce9e 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -1388,11 +1388,19 @@ void QTreeViewPrivate::adjustViewOptionsForIndex(QStyleOptionViewItemV4 *option, option->showDecorationSelected = (selectionBehavior & QTreeView::SelectRows) || option->showDecorationSelected; - QVector<int> logicalIndices; - QVector<QStyleOptionViewItemV4::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex + QVector<int> logicalIndices; // index = visual index of visible columns only. data = logical index. + QVector<QStyleOptionViewItemV4::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex, visible columns only. calcLogicalIndices(&logicalIndices, &viewItemPosList); - int logicalIndex = header->logicalIndex(current.column()); - option->viewItemPosition = viewItemPosList.at(logicalIndex); + + int columnIndex = 0; + for (int visualIndex = 0; visualIndex < current.column(); ++visualIndex) { + int logicalIndex = header->logicalIndex(visualIndex); + if (!header->isSectionHidden(logicalIndex)) { + ++columnIndex; + } + } + + option->viewItemPosition = viewItemPosList.at(columnIndex); } @@ -2919,7 +2927,6 @@ void QTreeViewPrivate::expand(int item, bool emitSignal) void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem &viewItem) { - Q_Q(QTreeView); viewItems.insert(pos, count, viewItem); QTreeViewItem *items = viewItems.data(); for (int i = pos + count; i < viewItems.count(); i++) @@ -2927,6 +2934,7 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem & items[i].parentItem += count; #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QTreeView); if (QAccessible::isActive()) { QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); } @@ -2936,7 +2944,6 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem & void QTreeViewPrivate::removeViewItems(int pos, int count) { - Q_Q(QTreeView); viewItems.remove(pos, count); QTreeViewItem *items = viewItems.data(); for (int i = pos; i < viewItems.count(); i++) @@ -2944,6 +2951,7 @@ void QTreeViewPrivate::removeViewItems(int pos, int count) items[i].parentItem -= count; #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QTreeView); if (QAccessible::isActive()) { QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); } diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 52e304633e..c3362ae7a1 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -2666,8 +2666,17 @@ void QWidgetPrivate::setConstraints_sys() #ifdef ALIEN_DEBUG qDebug() << "QWidgetPrivate::setConstraints_sys START" << q; #endif - if (q->testAttribute(Qt::WA_WState_Created)) + if (q->testAttribute(Qt::WA_WState_Created)) { do_size_hints(q, extra); + QtMWMHints mwmHints = GetMWMHints(X11->display, q->internalWinId()); + const bool wasFuncResize = mwmHints.functions & MWM_FUNC_RESIZE; + if (q->minimumSize() == q->maximumSize()) + mwmHints.functions &= ~MWM_FUNC_RESIZE; + else + mwmHints.functions |= MWM_FUNC_RESIZE; + if (wasFuncResize != (mwmHints.functions & MWM_FUNC_RESIZE)) + SetMWMHints(X11->display, q->internalWinId(), mwmHints); + } #ifdef ALIEN_DEBUG qDebug() << "QWidgetPrivate::setConstraints_sys END" << q; #endif diff --git a/src/imports/shaders/glfunctions.h b/src/imports/shaders/glfunctions.h index c7ba80d88d..c7ba80d88d 100755..100644 --- a/src/imports/shaders/glfunctions.h +++ b/src/imports/shaders/glfunctions.h diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp index b954e5a8e6..b954e5a8e6 100755..100644 --- a/src/imports/shaders/shadereffectitem.cpp +++ b/src/imports/shaders/shadereffectitem.cpp diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index 80650257f1..da09a9c0aa 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -46,34 +46,56 @@ #include <QtCore/qstringlist.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qmutex.h> +#include <QtCore/qthread.h> +#include <QtCore/private/qcoreapplication_p.h> #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE -#define Q_GLOBAL_STATIC_QAPP_DESTRUCTION(TYPE, NAME) \ - static QGlobalStatic<TYPE > this_##NAME \ - = { Q_BASIC_ATOMIC_INITIALIZER(0), false }; \ - static void NAME##_cleanup() \ - { \ - this_##NAME.pointer->cleanup(); \ - this_##NAME.pointer = 0; \ - } \ - static TYPE *NAME() \ - { \ - if (!this_##NAME.pointer) { \ - TYPE *x = new TYPE; \ - if (!this_##NAME.pointer.testAndSetOrdered(0, x)) \ - delete x; \ - else { \ - qAddPostRoutine(NAME##_cleanup); \ - this_##NAME.pointer->initialize(); \ - } \ - } \ - return this_##NAME.pointer; \ - } +static QBasicAtomicPointer<QNetworkConfigurationManagerPrivate> connManager_ptr; +Q_GLOBAL_STATIC(QMutex, connManager_mutex) + +static void connManager_cleanup() +{ + // this is not atomic or thread-safe! + if(connManager_ptr) + connManager_ptr->cleanup(); + connManager_ptr = 0; +} + +void QNetworkConfigurationManagerPrivate::addPostRoutine() +{ + qAddPostRoutine(connManager_cleanup); +} -Q_GLOBAL_STATIC_QAPP_DESTRUCTION(QNetworkConfigurationManagerPrivate, connManager); +static QNetworkConfigurationManagerPrivate *connManager() +{ + QNetworkConfigurationManagerPrivate *ptr = connManager_ptr.fetchAndAddAcquire(0); + if (!ptr) { + QMutexLocker locker(connManager_mutex()); + if (!(ptr = connManager_ptr.fetchAndAddAcquire(0))) { + ptr = new QNetworkConfigurationManagerPrivate; + + if (QCoreApplicationPrivate::mainThread() == QThread::currentThread()) { + // right thread or no main thread yet + ptr->addPostRoutine(); + ptr->initialize(); + } else { + // wrong thread, we need to make the main thread do this + QObject *obj = new QObject; + QObject::connect(obj, SIGNAL(destroyed()), ptr, SLOT(addPostRoutine()), Qt::DirectConnection); + ptr->initialize(); // this moves us to the right thread + obj->moveToThread(QCoreApplicationPrivate::mainThread()); + obj->deleteLater(); + } + + connManager_ptr.fetchAndStoreRelease(ptr); + } + } + return ptr; +} QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate() { diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index 56f66b475a..ded170125b 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/src/network/bearer/qnetworkconfigmanager_p.h @@ -94,6 +94,8 @@ public: public Q_SLOTS: void updateConfigurations(); + static void addPostRoutine(); + Q_SIGNALS: void configurationAdded(const QNetworkConfiguration &config); void configurationRemoved(const QNetworkConfiguration &config); @@ -108,6 +110,7 @@ private Q_SLOTS: void pollEngines(); + private: Q_INVOKABLE void startPolling(); QTimer *pollTimer; diff --git a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj index dedc462752..dedc462752 100755..100644 --- a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj +++ b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj index 021eed24f3..021eed24f3 100755..100644 --- a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj +++ b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d5281f4627..d5281f4627 100755..100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png Binary files differindex 7fbd802a44..7fbd802a44 100755..100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png Binary files differindex 462edacc0e..462edacc0e 100755..100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png Binary files differindex f8061a1235..f8061a1235 100755..100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png Binary files differindex 1297ec7c2b..1297ec7c2b 100755..100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png Binary files differindex 4aa9fb5e8e..4aa9fb5e8e 100755..100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro index 23ec56bbe7..23ec56bbe7 100755..100644 --- a/tests/auto/mediaobject/mediaobject.pro +++ b/tests/auto/mediaobject/mediaobject.pro diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp index cca212e278..9754a845c6 100644 --- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp @@ -93,6 +93,9 @@ private slots: void receiveUnknownType_data(); void receiveUnknownType(); + void demarshallPrimitives_data(); + void demarshallPrimitives(); + private: int fileDescriptorForTest(); @@ -1168,5 +1171,84 @@ void tst_QDBusMarshall::receiveUnknownType() #endif } +void tst_QDBusMarshall::demarshallPrimitives_data() +{ + sendBasic_data(); +} + +template<class T> +QVariant demarshallPrimitiveAs(const QDBusArgument& dbusArg) +{ + T val; + dbusArg >> val; + return qVariantFromValue(val); +} + +QVariant demarshallPrimitiveAs(int typeIndex, const QDBusArgument& dbusArg) +{ + switch (typeIndex) { + case 0: + return demarshallPrimitiveAs<uchar>(dbusArg); + case 1: + return demarshallPrimitiveAs<bool>(dbusArg); + case 2: + return demarshallPrimitiveAs<short>(dbusArg); + case 3: + return demarshallPrimitiveAs<ushort>(dbusArg); + case 4: + return demarshallPrimitiveAs<int>(dbusArg); + case 5: + return demarshallPrimitiveAs<uint>(dbusArg); + case 6: + return demarshallPrimitiveAs<qlonglong>(dbusArg); + case 7: + return demarshallPrimitiveAs<qulonglong>(dbusArg); + case 8: + return demarshallPrimitiveAs<double>(dbusArg); + default: + return QVariant(); + } +} + +void tst_QDBusMarshall::demarshallPrimitives() +{ + QFETCH(QVariant, value); + QFETCH(QString, sig); + + QDBusConnection con = QDBusConnection::sessionBus(); + + QVERIFY(con.isConnected()); + + // Demarshall each test data value to all primitive types to test + // demarshalling to the wrong type does not cause a crash + for (int typeIndex = 0; true; ++typeIndex) { + QDBusMessage msg = QDBusMessage::createMethodCall(serviceName, objectPath, + interfaceName, "ping"); + QDBusArgument sendArg; + sendArg.beginStructure(); + sendArg.appendVariant(value); + sendArg.endStructure(); + msg.setArguments(QVariantList() << qVariantFromValue(sendArg)); + QDBusMessage reply = con.call(msg); + + const QDBusArgument receiveArg = qvariant_cast<QDBusArgument>(reply.arguments().at(0)); + receiveArg.beginStructure(); + QCOMPARE(receiveArg.currentSignature(), sig); + + const QVariant receiveValue = demarshallPrimitiveAs(typeIndex, receiveArg); + if (receiveValue.type() == value.type()) { + // Value type is the same, compare the values + QCOMPARE(receiveValue, value); + QVERIFY(receiveArg.atEnd()); + } + + receiveArg.endStructure(); + QVERIFY(receiveArg.atEnd()); + + if (!receiveValue.isValid()) + break; + } +} + QTEST_MAIN(tst_QDBusMarshall) #include "tst_qdbusmarshall.moc" diff --git a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp index a8b6c0854e..34ca5d467d 100644 --- a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp +++ b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp @@ -44,6 +44,7 @@ #include <qgraphicslayoutitem.h> #include <float.h> #include <limits.h> +#include <QtGui/qgraphicswidget.h> class tst_QGraphicsLayoutItem : public QObject { Q_OBJECT @@ -60,6 +61,8 @@ private slots: void contentsRect(); void effectiveSizeHint_data(); void effectiveSizeHint(); + void effectiveSizeHint2_data(); + void effectiveSizeHint2(); void getContentsMargins(); void isLayout_data(); void isLayout(); @@ -104,6 +107,40 @@ public: }; +class RectWidget : public QGraphicsWidget +{ +public: + RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(fn2000_div_w) {} + + + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const + { + if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) { + return m_sizeHints[which]; + } + if (m_fnConstraint) { + return m_fnConstraint(which, constraint); + } + return QGraphicsWidget::sizeHint(which, constraint); + } + + void setSizeHint(Qt::SizeHint which, const QSizeF &size) { + m_sizeHints[which] = size; + updateGeometry(); + } + + void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + } + + QSizeF m_sizeHints[Qt::NSizeHints]; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); + + static QSizeF fn2000_div_w(Qt::SizeHint /*which*/, const QSizeF &constraint = QSizeF()) { + return QSizeF(constraint.width(), 2000.0/constraint.width()); + } +}; + // This will be called before the first test function is executed. // It is only called once. void tst_QGraphicsLayoutItem::initTestCase() @@ -183,6 +220,77 @@ void tst_QGraphicsLayoutItem::effectiveSizeHint() QCOMPARE(r.height(), constraint.height()); } + +void tst_QGraphicsLayoutItem::effectiveSizeHint2_data() +{ + QTest::addColumn<QSizeF>("minimumSize"); + QTest::addColumn<QSizeF>("preferredSize"); + QTest::addColumn<QSizeF>("maximumSize"); + QTest::addColumn<QSizeF>("minimumSizeHint"); + QTest::addColumn<QSizeF>("preferredSizeHint"); + QTest::addColumn<QSizeF>("maximumSizeHint"); + + QTest::addColumn<QSizeF>("inputConstraint"); + QTest::addColumn<QSizeF>("expectedMinimumESH"); + QTest::addColumn<QSizeF>("expectedPreferredESH"); + QTest::addColumn<QSizeF>("expectedMaximumESH"); + + QTest::newRow("P1-a") + << QSizeF( 6, 4) << QSizeF( 60, 40) << QSizeF( 600, 400) + << QSizeF( -1, -1) << QSizeF( -1, -1) << QSizeF( -1, -1) + << QSizeF(-1, -1) + << QSizeF(6, 4) << QSizeF( 60, 40) << QSizeF(600, 400); + + QTest::newRow("P1-hfw-1") + << QSizeF( -1, -1) << QSizeF( -1, -1) << QSizeF( -1, -1) + << QSizeF( 6, 4) << QSizeF( 60, 40) << QSizeF(600, 400) + << QSizeF(200, -1) + << QSizeF(200, 10) << QSizeF(200, 10) << QSizeF(200, 10); + + QTest::newRow("P1-hfw-2") + << QSizeF( 6, -1) << QSizeF( 60, -1) << QSizeF(600, -1) + << QSizeF( -1, -1) << QSizeF( -1, -1) << QSizeF( -1, -1) + << QSizeF(200, -1) + << QSizeF(200, 10) << QSizeF(200, 10) << QSizeF(200, 10); + + // constraint is bigger than max width + QTest::newRow("P1-hfw-3") + << QSizeF( 5, -1) << QSizeF( 50, -1) << QSizeF(500, -1) + << QSizeF( -1, -1) << QSizeF( -1, -1) << QSizeF( -1, -1) + << QSizeF(600, -1) + << QSizeF(500, 4) << QSizeF(500, 4) << QSizeF(500, 4); + +} + +void tst_QGraphicsLayoutItem::effectiveSizeHint2() +{ + QFETCH(QSizeF, minimumSize); + QFETCH(QSizeF, preferredSize); + QFETCH(QSizeF, maximumSize); + QFETCH(QSizeF, minimumSizeHint); + QFETCH(QSizeF, preferredSizeHint); + QFETCH(QSizeF, maximumSizeHint); + + QFETCH(QSizeF, inputConstraint); + QFETCH(QSizeF, expectedMinimumESH); + QFETCH(QSizeF, expectedPreferredESH); + QFETCH(QSizeF, expectedMaximumESH); + + RectWidget *item = new RectWidget; + item->setMinimumSize(minimumSize); + item->setPreferredSize(preferredSize); + item->setMaximumSize(maximumSize); + item->setSizeHint(Qt::MinimumSize, minimumSizeHint); + item->setSizeHint(Qt::PreferredSize, preferredSizeHint); + item->setSizeHint(Qt::MaximumSize, maximumSizeHint); + + QCOMPARE(item->effectiveSizeHint(Qt::MinimumSize, inputConstraint), expectedMinimumESH); + QCOMPARE(item->effectiveSizeHint(Qt::PreferredSize, inputConstraint), expectedPreferredESH); + QCOMPARE(item->effectiveSizeHint(Qt::MaximumSize, inputConstraint), expectedMaximumESH); + +} + + // void getContentsMargins(qreal* left, qreal* top, qreal* right, qreal* bottom) const public void tst_QGraphicsLayoutItem::getContentsMargins() { diff --git a/tests/auto/qimagereader/images/txts.png b/tests/auto/qimagereader/images/txts.png Binary files differindex 99be1eb4f9..99be1eb4f9 100755..100644 --- a/tests/auto/qimagereader/images/txts.png +++ b/tests/auto/qimagereader/images/txts.png diff --git a/tests/auto/qlocalsocket/lackey/scripts/client.js b/tests/auto/qlocalsocket/lackey/scripts/client.js index 76cc0b97ad..76cc0b97ad 100755..100644 --- a/tests/auto/qlocalsocket/lackey/scripts/client.js +++ b/tests/auto/qlocalsocket/lackey/scripts/client.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js b/tests/auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js index 720b39dd54..720b39dd54 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/ExecutionContexts/10.1.3-2.js b/tests/auto/qscriptjstestsuite/tests/ecma/ExecutionContexts/10.1.3-2.js index 3762842461..3762842461 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma/ExecutionContexts/10.1.3-2.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma/ExecutionContexts/10.1.3-2.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/README b/tests/auto/qscriptjstestsuite/tests/ecma/README index 91f174ab61..91f174ab61 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma/README +++ b/tests/auto/qscriptjstestsuite/tests/ecma/README diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/README b/tests/auto/qscriptjstestsuite/tests/ecma_2/README index 6da6cdd514..6da6cdd514 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/README +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/README diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js index cc7907d006..cc7907d006 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js index 5153d25f9d..5153d25f9d 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js index 8ea446a248..8ea446a248 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js index 9cc837d8ef..9cc837d8ef 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-003-n.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-003-n.js index 7a763a895c..7a763a895c 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-003-n.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-003-n.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-004-n.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-004-n.js index 1662ae566b..1662ae566b 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-004-n.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-004-n.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-005-n.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-005-n.js index 1a9b1b3437..1a9b1b3437 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-005-n.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-005-n.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js index 03c0f16fb9..03c0f16fb9 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js index 0436b8c1e0..0436b8c1e0 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js index b55430b44e..b55430b44e 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-01.js index 4e277e6da5..4e277e6da5 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-02.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-02.js index ee426a0cec..ee426a0cec 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-02.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-02.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-03.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-03.js index 95ee7f7a92..95ee7f7a92 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-03.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-03.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-04.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-04.js index fe9f8fc71e..fe9f8fc71e 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-04.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-04.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js index 36cf1478d2..36cf1478d2 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js index c869d7bff4..c869d7bff4 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js index f750ffb449..f750ffb449 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js index 61b1de6ef1..61b1de6ef1 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js index d79b60b996..d79b60b996 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js index b197dcb9c2..b197dcb9c2 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js index e3b073e7ec..e3b073e7ec 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/10.6.1-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/10.6.1-01.js index 6fbe85e19f..6fbe85e19f 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/10.6.1-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/10.6.1-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/regress-448595-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/regress-448595-01.js index f303199b51..f303199b51 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/regress-448595-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/regress-448595-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js index fd47d5d86b..fd47d5d86b 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js index 8f387c1349..8f387c1349 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js index 99af0f87c5..99af0f87c5 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.1-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.1-01.js index 05f9622ce2..05f9622ce2 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.1-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.1-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.2-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.2-01.js index 64e426888a..64e426888a 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.2-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.2-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.3-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.3-01.js index d5af3b86d4..d5af3b86d4 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.3-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.3-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js index 78005560a7..78005560a7 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js index e159c4c87f..e159c4c87f 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/LexicalConventions/7.9.1.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/LexicalConventions/7.9.1.js index 10ee26f929..10ee26f929 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/LexicalConventions/7.9.1.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/LexicalConventions/7.9.1.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Number/regress-442242-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Number/regress-442242-01.js index e3fa070e5a..e3fa070e5a 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Number/regress-442242-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Number/regress-442242-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js index 2897ece555..2897ece555 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js index d3962004e3..d3962004e3 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-385393-07.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-385393-07.js index 0473fe4956..0473fe4956 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-385393-07.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-385393-07.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.13.1-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.13.1-002.js index 5d3307e4a7..5d3307e4a7 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.13.1-002.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.13.1-002.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js index c48565ba5f..c48565ba5f 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js index 671faceb81..671faceb81 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/README b/tests/auto/qscriptjstestsuite/tests/ecma_3/README index eebd421c2e..eebd421c2e 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/README +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/README diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js index d68b86c2ed..d68b86c2ed 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js index 9d462359fa..9d462359fa 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js index 2e3d044b74..2e3d044b74 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js index dd2f540f6c..dd2f540f6c 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js index 8680b7bcfd..8680b7bcfd 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js index a24a07bb2b..a24a07bb2b 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js index a9b00d317c..a9b00d317c 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js index b097fbc3d7..b097fbc3d7 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js index 41ebf0a731..41ebf0a731 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js index dfd53a9922..dfd53a9922 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js index 923c1e5ab3..923c1e5ab3 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js index 236eb00d28..236eb00d28 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js index 6e7339f9e9..6e7339f9e9 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-01-n.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-01-n.js index 437dcbd5c5..437dcbd5c5 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-01-n.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-01-n.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-02.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-02.js index 3cd858e845..3cd858e845 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-02.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-02.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-03.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-03.js index ffc5c5a4cc..ffc5c5a4cc 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-03.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-03.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-04.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-04.js index 0c78a372ee..0c78a372ee 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-04.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-04.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-385393-04.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-385393-04.js index 6e735fd1d2..6e735fd1d2 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-385393-04.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-385393-04.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js index f57f3a4f98..f57f3a4f98 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js index 1f21d19739..1f21d19739 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js index ecd5a2dd42..ecd5a2dd42 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-441477-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-441477-01.js index 1be199743d..1be199743d 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-441477-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-441477-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js index 97c3ca3136..97c3ca3136 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js index e1ebdb6e30..e1ebdb6e30 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js index 003cd0fa42..003cd0fa42 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js index 733cd713d8..733cd713d8 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js index 9610238cc3..9610238cc3 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js index 368fde1278..368fde1278 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-01.js index bb10ac6f7a..bb10ac6f7a 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-01.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-01.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-02-n.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-02-n.js index 0e3c4b0189..0e3c4b0189 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-02-n.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-02-n.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js index 2339522cb6..2339522cb6 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js index f941cb7800..f941cb7800 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js index b69e9d065a..b69e9d065a 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js index d7074d9128..d7074d9128 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js index 85e684882f..85e684882f 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js index 5d15ce31a9..5d15ce31a9 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js index a5f5fb769b..a5f5fb769b 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-385393-03.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-385393-03.js index 40c7e8dd81..40c7e8dd81 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-385393-03.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-385393-03.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js index 9966269115..9966269115 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js index 446adb95a6..446adb95a6 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js index 4dedd5a0e3..4dedd5a0e3 100755..100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js diff --git a/tests/auto/qsqldatabase/testdata/qtest.mdb b/tests/auto/qsqldatabase/testdata/qtest.mdb Binary files differindex f388f192ac..f388f192ac 100755..100644 --- a/tests/auto/qsqldatabase/testdata/qtest.mdb +++ b/tests/auto/qsqldatabase/testdata/qtest.mdb diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index c37a4ea119..be991dc9ec 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -113,7 +113,6 @@ struct PublicView : public QTreeView inline QStyleOptionViewItem viewOptions() const { return QTreeView::viewOptions(); } inline int sizeHintForColumn(int column) const { return QTreeView::sizeHintForColumn(column); } - inline void startDrag(Qt::DropActions supportedActions) { QTreeView::startDrag(supportedActions); } QAbstractItemViewPrivate* aiv_priv() { return static_cast<QAbstractItemViewPrivate*>(d_ptr.data()); } }; @@ -2906,6 +2905,10 @@ void tst_QTreeView::styleOptionViewItem() { class MyDelegate : public QStyledItemDelegate { + static QString posToString(QStyleOptionViewItemV4::ViewItemPosition pos) { + static const char* s_pos[] = { "Invalid", "Beginning", "Middle", "End", "OnlyOne" }; + return s_pos[pos]; + } public: void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const { @@ -2922,16 +2925,16 @@ void tst_QTreeView::styleOptionViewItem() QCOMPARE(!(opt.features & QStyleOptionViewItemV2::HasCheckIndicator), !opt.text.contains("Checkable")); if (opt.text.contains("Beginning")) - QCOMPARE(opt.viewItemPosition, QStyleOptionViewItemV4::Beginning); + QCOMPARE(posToString(opt.viewItemPosition), posToString(QStyleOptionViewItemV4::Beginning)); if (opt.text.contains("Middle")) - QCOMPARE(opt.viewItemPosition, QStyleOptionViewItemV4::Middle); + QCOMPARE(posToString(opt.viewItemPosition), posToString(QStyleOptionViewItemV4::Middle)); if (opt.text.contains("End")) - QCOMPARE(opt.viewItemPosition, QStyleOptionViewItemV4::End); + QCOMPARE(posToString(opt.viewItemPosition), posToString(QStyleOptionViewItemV4::End)); if (opt.text.contains("OnlyOne")) - QCOMPARE(opt.viewItemPosition, QStyleOptionViewItemV4::OnlyOne); + QCOMPARE(posToString(opt.viewItemPosition), posToString(QStyleOptionViewItemV4::OnlyOne)); if (opt.text.contains("Checked")) QCOMPARE(opt.checkState, Qt::Checked); @@ -2956,41 +2959,45 @@ void tst_QTreeView::styleOptionViewItem() MyDelegate delegate; view.setItemDelegate(&delegate); model.appendRow(QList<QStandardItem*>() - << new QStandardItem("Beginning") << new QStandardItem("Middle") << new QStandardItem("Middle") << new QStandardItem("End") ); + << new QStandardItem("Beginning") << new QStandardItem("Hidden") << new QStandardItem("Middle") << new QStandardItem("Middle") << new QStandardItem("End") ); QStandardItem *par1 = new QStandardItem("Beginning HasChildren"); model.appendRow(QList<QStandardItem*>() - << par1 << new QStandardItem("Middle HasChildren") << new QStandardItem("Middle HasChildren") << new QStandardItem("End HasChildren") ); + << par1 << new QStandardItem("Hidden") << new QStandardItem("Middle HasChildren") << new QStandardItem("Middle HasChildren") << new QStandardItem("End HasChildren") ); model.appendRow(QList<QStandardItem*>() - << new QStandardItem("OnlyOne") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Assert") ); + << new QStandardItem("OnlyOne") << new QStandardItem("Hidden") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Assert") ); QStandardItem *checkable = new QStandardItem("Checkable"); checkable->setCheckable(true); QStandardItem *checked = new QStandardItem("Checkable Checked"); - checkable->setCheckable(true); + checked->setCheckable(true); checked->setCheckState(Qt::Checked); model.appendRow(QList<QStandardItem*>() - << new QStandardItem("Beginning") << checkable << checked << new QStandardItem("End") ); + << new QStandardItem("Beginning") << new QStandardItem("Hidden") << checkable << checked << new QStandardItem("End") ); model.appendRow(QList<QStandardItem*>() - << new QStandardItem("Beginning Last") << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); + << new QStandardItem("Beginning Last") << new QStandardItem("Hidden") << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); par1->appendRow(QList<QStandardItem*>() - << new QStandardItem("Beginning") << new QStandardItem("Middle") << new QStandardItem("Middle") << new QStandardItem("End") ); + << new QStandardItem("Beginning") << new QStandardItem("Hidden") << new QStandardItem("Middle") << new QStandardItem("Middle") << new QStandardItem("End") ); QStandardItem *par2 = new QStandardItem("Beginning HasChildren"); par1->appendRow(QList<QStandardItem*>() - << par2 << new QStandardItem("Middle HasChildren") << new QStandardItem("Middle HasChildren") << new QStandardItem("End HasChildren") ); + << par2 << new QStandardItem("Hidden") << new QStandardItem("Middle HasChildren") << new QStandardItem("Middle HasChildren") << new QStandardItem("End HasChildren") ); par2->appendRow(QList<QStandardItem*>() - << new QStandardItem("Beginning Last") << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); + << new QStandardItem("Beginning Last") << new QStandardItem("Hidden") << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); QStandardItem *par3 = new QStandardItem("Beginning Last"); par1->appendRow(QList<QStandardItem*>() - << par3 << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); + << par3 << new QStandardItem("Hidden") << new QStandardItem("Middle Last") << new QStandardItem("Middle Last") << new QStandardItem("End Last") ); par3->appendRow(QList<QStandardItem*>() - << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Asser") ); + << new QStandardItem("Assert") << new QStandardItem("Hidden") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Asser") ); view.setRowHidden(0, par3->index(), true); par1->appendRow(QList<QStandardItem*>() - << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Asser") ); + << new QStandardItem("Assert") << new QStandardItem("Hidden") << new QStandardItem("Assert") << new QStandardItem("Assert") << new QStandardItem("Asser") ); view.setRowHidden(3, par1->index(), true); + view.setColumnHidden(1, true); + const int visibleColumns = 4; + const int modelColumns = 5; + view.header()->swapSections(2, 3); view.setFirstColumnSpanned(2, QModelIndex(), true); view.setAlternatingRowColors(true); @@ -3011,10 +3018,10 @@ void tst_QTreeView::styleOptionViewItem() // test that the rendering of drag pixmap sets the correct options too (QTBUG-15834) delegate.count = 0; - QItemSelection sel(model.index(0,0), model.index(0,3)); + QItemSelection sel(model.index(0,0), model.index(0,modelColumns-1)); QRect rect; view.aiv_priv()->renderToPixmap(sel.indexes(), &rect); - QTRY_VERIFY(delegate.count >= 4); + QTRY_VERIFY(delegate.count == visibleColumns); //test dynamic models { diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent index 1cff3fd44f..1cff3fd44f 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent index 45f6d8e74e..45f6d8e74e 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent index 3436f20001..3436f20001 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent index c6e97f821f..c6e97f821f 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent index 4df2f0c2ac..4df2f0c2ac 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent Binary files differindex ab1d696dd7..ab1d696dd7 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent Binary files differindex c6ca61f9c8..c6ca61f9c8 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent index 67c3297611..67c3297611 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent index b19be3a497..b19be3a497 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent index 8eb1fb9c41..8eb1fb9c41 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent index 7f25c502dd..7f25c502dd 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent Binary files differindex 470fd6fe44..470fd6fe44 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent Binary files differindex 86a8679faf..86a8679faf 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent index 67c3297611..67c3297611 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent index 931f3ad6d8..931f3ad6d8 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent index 40f7ff58a2..40f7ff58a2 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent index 61def75cb7..61def75cb7 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent index ade9599032..ade9599032 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent index bef50b1f38..bef50b1f38 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent index 8f305a82bd..8f305a82bd 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent index fbf4ca4947..fbf4ca4947 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent index fbf4ca4947..fbf4ca4947 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent index fbf4ca4947..fbf4ca4947 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent index 52a28f5deb..52a28f5deb 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent index fbf4ca4947..fbf4ca4947 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent index 7e372e65e9..7e372e65e9 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent index a3691d9f08..a3691d9f08 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent index 6eaf779329..6eaf779329 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent index 00d2f30e1d..00d2f30e1d 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent index bf77ef8336..bf77ef8336 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent index ffd9adde61..ffd9adde61 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent index 2d46f76fc3..2d46f76fc3 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent index d18201a98b..d18201a98b 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent index 815291c6d2..815291c6d2 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent index 9f8f2afd2b..9f8f2afd2b 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent index 26f2d8beb2..26f2d8beb2 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent index e3268819f7..e3268819f7 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent index aa6d0eccac..aa6d0eccac 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent index 389d259eb1..389d259eb1 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent index bdc93af639..bdc93af639 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent index 712cce3700..712cce3700 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent index ac249d7b2c..ac249d7b2c 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent index df94df5560..df94df5560 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent index e3864460df..e3864460df 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent index f7f94ab152..f7f94ab152 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent index bef50b1f38..bef50b1f38 100755..100644 --- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index 17d164d463..17d164d463 100755..100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 2e0f6a172c..2e0f6a172c 100755..100644 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 3474dd061a..3474dd061a 100755..100644 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml index f9f92a4c32..f9f92a4c32 100755..100644 --- a/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml +++ b/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml index b8a15ae338..b8a15ae338 100755..100644 --- a/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml +++ b/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml diff --git a/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png b/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png Binary files differindex 4a9b2831aa..4a9b2831aa 100755..100644 --- a/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png +++ b/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index b242d6094b..b242d6094b 100755..100644 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg index 3005133b8e..3005133b8e 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png Binary files differindex f3024f7eeb..f3024f7eeb 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png Binary files differindex 144c02d548..144c02d548 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png Binary files differindex c73d38927e..c73d38927e 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png Binary files differindex b2267737fd..b2267737fd 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg Binary files differindex 5bc7b58550..5bc7b58550 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp index 87c2f4a451..28882905c9 100644 --- a/tools/linguist/linguist/messageeditor.cpp +++ b/tools/linguist/linguist/messageeditor.cpp @@ -262,7 +262,6 @@ void MessageEditor::addPluralForm(int model, const QString &label, bool writable { FormMultiWidget *transEditor = new FormMultiWidget(label); connect(transEditor, SIGNAL(editorCreated(QTextEdit*)), SLOT(editorCreated(QTextEdit*))); - connect(transEditor, SIGNAL(editorDeleted(QTextEdit*)), SLOT(editorDeleted(QTextEdit*))); transEditor->setEditingEnabled(writable); transEditor->setHideWhenEmpty(!writable); if (!m_editors[model].transTexts.isEmpty()) @@ -299,9 +298,9 @@ void MessageEditor::editorCreated(QTextEdit *te) } } -void MessageEditor::editorDeleted(QTextEdit *te) +void MessageEditor::editorDestroyed() { - if (m_selectionHolder == te) + if (m_selectionHolder == sender()) resetSelection(); } @@ -352,9 +351,13 @@ static void clearSelection(QTextEdit *t) void MessageEditor::selectionChanged(QTextEdit *te) { if (te != m_selectionHolder) { - if (m_selectionHolder) + if (m_selectionHolder) { clearSelection(m_selectionHolder); + disconnect(this, SLOT(editorDestroyed())); + } m_selectionHolder = (te->textCursor().hasSelection() ? te : 0); + if (FormatTextEdit *fte = qobject_cast<FormatTextEdit*>(m_selectionHolder)) + connect(fte, SIGNAL(editorDestroyed()), SLOT(editorDestroyed())); updateCanCutCopy(); } } @@ -371,6 +374,7 @@ void MessageEditor::resetSelection() { if (m_selectionHolder) { clearSelection(m_selectionHolder); + disconnect(this, SLOT(editorDestroyed())); m_selectionHolder = 0; updateCanCutCopy(); } diff --git a/tools/linguist/linguist/messageeditor.h b/tools/linguist/linguist/messageeditor.h index 21b340548b..0fbf658476 100644 --- a/tools/linguist/linguist/messageeditor.h +++ b/tools/linguist/linguist/messageeditor.h @@ -114,7 +114,7 @@ public slots: private slots: void editorCreated(QTextEdit *); - void editorDeleted(QTextEdit *); + void editorDestroyed(); void selectionChanged(QTextEdit *); void resetHoverSelection(); void emitTranslationChanged(QTextEdit *); diff --git a/tools/linguist/linguist/messageeditorwidgets.cpp b/tools/linguist/linguist/messageeditorwidgets.cpp index 29df673c76..042ef3da26 100644 --- a/tools/linguist/linguist/messageeditorwidgets.cpp +++ b/tools/linguist/linguist/messageeditorwidgets.cpp @@ -130,6 +130,11 @@ FormatTextEdit::FormatTextEdit(QWidget *parent) m_highlighter = new MessageHighlighter(this); } +FormatTextEdit::~FormatTextEdit() +{ + emit editorDestroyed(); +} + void FormatTextEdit::setEditable(bool editable) { // save default frame style @@ -362,11 +367,9 @@ void FormMultiWidget::setTranslation(const QString &text, bool userAction) QStringList texts = text.split(QChar(Translator::BinaryVariantSeparator), QString::KeepEmptyParts); while (m_editors.count() > texts.count()) { - FormatTextEdit *editor = m_editors.takeLast(); - emit editorDeleted(editor); delete m_minusButtons.takeLast(); delete m_plusButtons.takeLast(); - delete editor; + delete m_editors.takeLast(); } while (m_editors.count() < texts.count()) addEditor(m_editors.count()); diff --git a/tools/linguist/linguist/messageeditorwidgets.h b/tools/linguist/linguist/messageeditorwidgets.h index 1f6f1f5805..c6d92015b2 100644 --- a/tools/linguist/linguist/messageeditorwidgets.h +++ b/tools/linguist/linguist/messageeditorwidgets.h @@ -91,8 +91,12 @@ class FormatTextEdit : public ExpandingTextEdit Q_OBJECT public: FormatTextEdit(QWidget *parent = 0); + ~FormatTextEdit(); void setEditable(bool editable); +signals: + void editorDestroyed(); + public slots: void setPlainText(const QString & text, bool userAction); @@ -150,7 +154,6 @@ public: signals: void editorCreated(QTextEdit *); - void editorDeleted(QTextEdit *); void textChanged(QTextEdit *); void selectionChanged(QTextEdit *); void cursorPositionChanged(); diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp index bc617a9b46..9c491839dd 100644 --- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -466,11 +466,13 @@ static QString stringify(const QString &data) int i; for (i = 0; i < data.length(); ++i) { retval += QLatin1Char('\"'); - for ( ; i < data.length() && data[i] != QLatin1Char('\n'); ++i) + for ( ; i < data.length() && data[i] != QLatin1Char('\n') && data[i] != QLatin1Char('\r'); ++i) if (data[i] == QLatin1Char('\"')) retval += QLatin1String("\\\""); else retval += data[i]; + if (data[i] == QLatin1Char('\r') && data[i+1] == QLatin1Char('\n')) + i++; retval += QLatin1String("\\n\"\n"); } return retval; diff --git a/tools/qdoc3/doc/config/images/bg_l.png b/tools/qdoc3/doc/config/images/bg_l.png Binary files differindex 90b1da10b9..90b1da10b9 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_l.png +++ b/tools/qdoc3/doc/config/images/bg_l.png diff --git a/tools/qdoc3/doc/config/images/bg_l_blank.png b/tools/qdoc3/doc/config/images/bg_l_blank.png Binary files differindex 5a9673d81b..5a9673d81b 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_l_blank.png +++ b/tools/qdoc3/doc/config/images/bg_l_blank.png diff --git a/tools/qdoc3/doc/config/images/bg_r.png b/tools/qdoc3/doc/config/images/bg_r.png Binary files differindex f0fb121dea..f0fb121dea 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_r.png +++ b/tools/qdoc3/doc/config/images/bg_r.png diff --git a/tools/qdoc3/doc/config/images/box_bg.png b/tools/qdoc3/doc/config/images/box_bg.png Binary files differindex 3322f923f8..3322f923f8 100755..100644 --- a/tools/qdoc3/doc/config/images/box_bg.png +++ b/tools/qdoc3/doc/config/images/box_bg.png diff --git a/tools/qdoc3/doc/config/images/breadcrumb.png b/tools/qdoc3/doc/config/images/breadcrumb.png Binary files differindex 0ded5514d2..0ded5514d2 100755..100644 --- a/tools/qdoc3/doc/config/images/breadcrumb.png +++ b/tools/qdoc3/doc/config/images/breadcrumb.png diff --git a/tools/qdoc3/doc/config/images/bullet_gt.png b/tools/qdoc3/doc/config/images/bullet_gt.png Binary files differindex 7561b4edc4..7561b4edc4 100755..100644 --- a/tools/qdoc3/doc/config/images/bullet_gt.png +++ b/tools/qdoc3/doc/config/images/bullet_gt.png diff --git a/tools/qdoc3/doc/config/images/bullet_sq.png b/tools/qdoc3/doc/config/images/bullet_sq.png Binary files differindex a84845e3c7..a84845e3c7 100755..100644 --- a/tools/qdoc3/doc/config/images/bullet_sq.png +++ b/tools/qdoc3/doc/config/images/bullet_sq.png diff --git a/tools/qdoc3/doc/config/images/feedbackground.png b/tools/qdoc3/doc/config/images/feedbackground.png Binary files differindex 3a38d995d7..3a38d995d7 100755..100644 --- a/tools/qdoc3/doc/config/images/feedbackground.png +++ b/tools/qdoc3/doc/config/images/feedbackground.png diff --git a/tools/qdoc3/doc/config/images/horBar.png b/tools/qdoc3/doc/config/images/horBar.png Binary files differindex 100fe91c6c..100fe91c6c 100755..100644 --- a/tools/qdoc3/doc/config/images/horBar.png +++ b/tools/qdoc3/doc/config/images/horBar.png diff --git a/tools/qdoc3/doc/config/images/page_bg.png b/tools/qdoc3/doc/config/images/page_bg.png Binary files differindex 9b3bd999df..9b3bd999df 100755..100644 --- a/tools/qdoc3/doc/config/images/page_bg.png +++ b/tools/qdoc3/doc/config/images/page_bg.png diff --git a/tools/qdoc3/doc/config/images/sprites-combined.png b/tools/qdoc3/doc/config/images/sprites-combined.png Binary files differindex 3a48b21f6b..3a48b21f6b 100755..100644 --- a/tools/qdoc3/doc/config/images/sprites-combined.png +++ b/tools/qdoc3/doc/config/images/sprites-combined.png diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js index af204d8d06..af204d8d06 100755..100644 --- a/tools/qdoc3/doc/config/scripts/functions.js +++ b/tools/qdoc3/doc/config/scripts/functions.js diff --git a/tools/qdoc3/doc/config/scripts/jquery.js b/tools/qdoc3/doc/config/scripts/jquery.js index 0c7294c90a..0c7294c90a 100755..100644 --- a/tools/qdoc3/doc/config/scripts/jquery.js +++ b/tools/qdoc3/doc/config/scripts/jquery.js diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 4f523b93fd..964770436d 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -308,8 +308,12 @@ public: qml->writeArrayBinding(QLatin1String("exports"), exports); if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) { - qml->writeScriptBinding(QLatin1String("attachedType"), enquote( - convertToId(attachedType))); + // Can happen when a type is registered that returns itself as attachedPropertiesType() + // because there is no creatable type to attach to. + if (attachedType != meta) { + qml->writeScriptBinding(QLatin1String("attachedType"), enquote( + convertToId(attachedType))); + } } } diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp index ca52a7a3f8..48d1b02940 100644 --- a/tools/qmlplugindump/qmlstreamwriter.cpp +++ b/tools/qmlplugindump/qmlstreamwriter.cpp @@ -93,8 +93,7 @@ void QmlStreamWriter::writeEndObject() m_pendingLineLength = 0; m_maybeOneline = false; } else { - if (m_maybeOneline) - flushPotentialLinesWithNewlines(); + flushPotentialLinesWithNewlines(); --m_indentDepth; writeIndent(); m_stream->write("}\n"); |
