diff options
539 files changed, 420 insertions, 85 deletions
diff --git a/.hgignore b/.hgignore index ba5a1b0..ba5a1b0 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 c168654..c168654 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 fc5c16d..fc5c16d 100755..100644 --- a/demos/embedded/styledemo/files/add.png +++ b/demos/embedded/styledemo/files/add.png diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png Binary files differindex a0ab1fa..a0ab1fa 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 24f0659..4ad31c3 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 f7467c4..f7467c4 100755..100644 --- a/demos/mobile/qcamera/businesscardhandling.cpp +++ b/demos/mobile/qcamera/businesscardhandling.cpp diff --git a/demos/mobile/qcamera/businesscardhandling.h b/demos/mobile/qcamera/businesscardhandling.h index f67dd36..f67dd36 100755..100644 --- a/demos/mobile/qcamera/businesscardhandling.h +++ b/demos/mobile/qcamera/businesscardhandling.h diff --git a/demos/mobile/qcamera/button.cpp b/demos/mobile/qcamera/button.cpp index 2a54cd8..2a54cd8 100755..100644 --- a/demos/mobile/qcamera/button.cpp +++ b/demos/mobile/qcamera/button.cpp diff --git a/demos/mobile/qcamera/button.h b/demos/mobile/qcamera/button.h index f988713..f988713 100755..100644 --- a/demos/mobile/qcamera/button.h +++ b/demos/mobile/qcamera/button.h diff --git a/demos/mobile/qcamera/cameraexample.cpp b/demos/mobile/qcamera/cameraexample.cpp index 1c6a4f0..1c6a4f0 100755..100644 --- a/demos/mobile/qcamera/cameraexample.cpp +++ b/demos/mobile/qcamera/cameraexample.cpp diff --git a/demos/mobile/qcamera/cameraexample.h b/demos/mobile/qcamera/cameraexample.h index 8098ff4..8098ff4 100755..100644 --- a/demos/mobile/qcamera/cameraexample.h +++ b/demos/mobile/qcamera/cameraexample.h diff --git a/demos/mobile/qcamera/contactsdlg.cpp b/demos/mobile/qcamera/contactsdlg.cpp index defd34c..defd34c 100755..100644 --- a/demos/mobile/qcamera/contactsdlg.cpp +++ b/demos/mobile/qcamera/contactsdlg.cpp diff --git a/demos/mobile/qcamera/contactsdlg.h b/demos/mobile/qcamera/contactsdlg.h index 4397110..4397110 100755..100644 --- a/demos/mobile/qcamera/contactsdlg.h +++ b/demos/mobile/qcamera/contactsdlg.h diff --git a/demos/mobile/qcamera/icons/camera.png b/demos/mobile/qcamera/icons/camera.png Binary files differindex dc4ecbf..dc4ecbf 100755..100644 --- a/demos/mobile/qcamera/icons/camera.png +++ b/demos/mobile/qcamera/icons/camera.png diff --git a/demos/mobile/qcamera/icons/cameramms_icon.svg b/demos/mobile/qcamera/icons/cameramms_icon.svg index ae6f354..ae6f354 100755..100644 --- a/demos/mobile/qcamera/icons/cameramms_icon.svg +++ b/demos/mobile/qcamera/icons/cameramms_icon.svg diff --git a/demos/mobile/qcamera/icons/exit.png b/demos/mobile/qcamera/icons/exit.png Binary files differindex dbe586a..dbe586a 100755..100644 --- a/demos/mobile/qcamera/icons/exit.png +++ b/demos/mobile/qcamera/icons/exit.png diff --git a/demos/mobile/qcamera/icons/mms.png b/demos/mobile/qcamera/icons/mms.png Binary files differindex 46a1a73..46a1a73 100755..100644 --- a/demos/mobile/qcamera/icons/mms.png +++ b/demos/mobile/qcamera/icons/mms.png diff --git a/demos/mobile/qcamera/main.cpp b/demos/mobile/qcamera/main.cpp index 6157c2d..6157c2d 100755..100644 --- a/demos/mobile/qcamera/main.cpp +++ b/demos/mobile/qcamera/main.cpp diff --git a/demos/mobile/qcamera/messagehandling.cpp b/demos/mobile/qcamera/messagehandling.cpp index bf7bfcb..bf7bfcb 100755..100644 --- a/demos/mobile/qcamera/messagehandling.cpp +++ b/demos/mobile/qcamera/messagehandling.cpp diff --git a/demos/mobile/qcamera/messagehandling.h b/demos/mobile/qcamera/messagehandling.h index 86a9071..86a9071 100755..100644 --- a/demos/mobile/qcamera/messagehandling.h +++ b/demos/mobile/qcamera/messagehandling.h diff --git a/demos/mobile/qcamera/qcamera.pro b/demos/mobile/qcamera/qcamera.pro index 17b9513..17b9513 100755..100644 --- a/demos/mobile/qcamera/qcamera.pro +++ b/demos/mobile/qcamera/qcamera.pro diff --git a/demos/mobile/qcamera/resources.qrc b/demos/mobile/qcamera/resources.qrc index 833fa99..833fa99 100755..100644 --- a/demos/mobile/qcamera/resources.qrc +++ b/demos/mobile/qcamera/resources.qrc diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png Binary files differindex 3280afa..3280afa 100755..100644 --- a/demos/qtdemo/images/demobg.png +++ b/demos/qtdemo/images/demobg.png diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 2fde945..1ed60e9 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <categories name="Qt Examples and Demos"> <demos dirname="." docname="demos" name="Demonstrations"> - <example filename="declarative/samegame" name="SameGame" executable="false" qml="true"/> - <example filename="declarative/flickr" name="Flickr Client" executable="false" qml="true"/> + <example filename="declarative/samegame" name="SameGame"/> + <example filename="declarative/flickr" name="Flickr Client"/> <example filename="affine" name="Affine Transformations" /> <example filename="composition" name="Composition Modes" /> <example filename="gradients" name="Gradients" /> @@ -11,8 +11,8 @@ <example filename="chip" name="40000 Chips" /> <example filename="embeddeddialogs" name="Embedded Dialogs" /> <example filename="interview" name="Interview" /> - <example filename="declarative/rssnews" name="Rss Client" executable="false" qml="true"/> - <example filename="declarative/twitter" name="Twitter Client" executable="false" qml="true"/> + <example filename="declarative/rssnews" name="Rss Client"/> + <example filename="declarative/twitter" name="Twitter Client"/> <example filename="browser" name="Browser" /> <example filename="qmediaplayer" name="Media Player" /> <example filename="boxes" name="Boxes" /> @@ -41,11 +41,11 @@ <example filename="wordcount" name="Word Count" executable="false" /> </category> <category dirname="declarative/toys" name="Qt Declarative Examples"> - <example filename="dynamicscene" name="Dynamic Scene" executable="false" qml="true" /> - <example filename="tic-tac-toe" name="Tic Tac Toe" executable="false" qml="true" /> - <example filename="clocks" name="Clocks" executable="false" qml="true" /> - <example filename="corkboards" name="Corkboards" executable="false" qml="true" /> - <example filename="tvtennis" name="TV Tennis" executable="false" qml="true" /> + <example filename="dynamicscene" name="Dynamic Scene"/> + <example filename="tic-tac-toe" name="Tic Tac Toe"/> + <example filename="clocks" name="Clocks"/> + <example filename="corkboards" name="Corkboards"/> + <example filename="tvtennis" name="TV Tennis"/> </category> <category dirname="designer" name="Qt Designer"> <example filename="calculatorbuilder" name="Calculator Builder" /> diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png Binary files differindex ae857df..ae857df 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 5588fbb..5588fbb 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 c7f6a1b..c7f6a1b 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 7373ea6..7373ea6 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 161b06f..161b06f 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 4261261..4261261 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 83d1c47..83d1c47 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 b2daf1f..b2daf1f 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 fa49c52..fa49c52 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 dd751cf..dd751cf 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 d172b41..d172b41 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 2597635..2597635 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 7b042af..7b042af 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 73107ff..73107ff 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 d25caac..d25caac 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 90bcba4..90bcba4 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 7d2d416..7d2d416 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 66c757f..66c757f 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 3ccccf1..3ccccf1 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 8be1b6c..8be1b6c 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 3f046c9..3f046c9 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 6ee1f4a..6ee1f4a 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 ecf9101..ecf9101 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 57f03d9..57f03d9 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 af31fe9..af31fe9 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 fb6de1d..fb6de1d 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 9627088..9627088 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 90b1da1..90b1da1 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 5a9673d..5a9673d 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 f0fb121..f0fb121 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 3322f92..3322f92 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 0ded551..0ded551 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 7561b4e..7561b4e 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 a84845e..a84845e 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 3a38d99..3a38d99 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 100fe91..100fe91 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 9b3bd99..9b3bd99 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 3a48b21..3a48b21 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 af204d8..af204d8 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 0c7294c..0c7294c 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 4071145..4071145 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 16fb850..16fb850 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 afbff5f..afbff5f 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 e69de29..e69de29 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 e191bfa..e191bfa 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 58e7ab7..58e7ab7 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 1788e6c..c2846b1 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 c81d8f0..4fdb47c 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 ccc3f9d..ccc3f9d 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 c3fd90d..c3fd90d 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 670354c..670354c 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 daf480e..daf480e 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 24f0659..4ad31c3 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 4f7f63d..4f7f63d 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 72f09c1..72f09c1 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 eaf0425..eaf0425 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 f52a633..f52a633 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 afa26e1..afa26e1 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 383c3ce..383c3ce 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 59ff9c4..59ff9c4 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 d194acb..d194acb 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 ba18afb..ba18afb 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 3de03ac..3de03ac 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 4a6257d..4a6257d 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 711cac2..711cac2 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 1178aad..1178aad 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 fdde141..fdde141 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 9b5bdd7..9b5bdd7 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 f605468..f605468 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 98caab72..98caab72 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 fdde141..fdde141 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 8363af9..8363af9 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 7ad876c..7ad876c 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 3b338dd..3b338dd 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 8a4ab8f..8a4ab8f 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 fa50005..fa50005 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 be59c59..be59c59 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 6f93c62..6f93c62 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 8a4ab8f..8a4ab8f 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 ee0e609..ee0e609 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 5a185d9..5a185d9 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 6d27306..6d27306 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 75246f7..75246f7 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 4b7e59a..4b7e59a 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 37303f8..37303f8 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 e5d2094..e5d2094 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 ecfd58e..ecfd58e 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 0acd8c1..0acd8c1 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 75246f7..75246f7 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 0fa8da0..0fa8da0 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 6398485..6398485 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 4a90751..4a90751 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 75246f7..75246f7 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 3bd36d9..3bd36d9 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 0a30dab..0a30dab 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 1ee7574..1ee7574 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 450bfe4..450bfe4 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 a0f86d6..a0f86d6 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 26ee255..26ee255 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 30e9413..30e9413 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 01cd0f5..01cd0f5 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 a3202c6..a3202c6 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 fee7025..fee7025 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 9a548ea..9a548ea 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 30410a5..30410a5 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 9cf9c73..9cf9c73 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 a244316..a244316 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 678d1d9..678d1d9 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 6b0bbde..6b0bbde 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 c9c013a..c9c013a 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 fa3bd0d..fa3bd0d 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 4af469a..4af469a 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 2d90bf9..2d90bf9 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 fe14aa2..fe14aa2 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 87037c9..87037c9 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 4b850b9..4b850b9 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 e44a633..e44a633 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 7997cc2..7997cc2 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 1c03e48..1c03e48 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 c2a3a30..c2a3a30 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 1293e2e..1293e2e 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 7799153..7799153 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 48f9d68..48f9d68 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 0fbaf52..0fbaf52 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 6d0c9f7..6d0c9f7 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 24f0b22..24f0b22 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 0203d81..0203d81 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 3c07f8b..3c07f8b 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 1f2e454..1f2e454 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 ae37c34..ae37c34 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 aa1e04b..aa1e04b 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 d2f3040..d2f3040 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 f448927..f448927 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 ba491c4..ba491c4 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 9f06662..9f06662 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 4116de8..4116de8 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 75142b5..75142b5 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 224053f..224053f 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 5a31aa0..5a31aa0 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 1205822..1205822 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 6e31292..6e31292 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 bbd0fbc..bbd0fbc 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 5b9332c..5b9332c 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 32d49bf..32d49bf 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 f1e87f6..f1e87f6 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 3d2a5b6..3d2a5b6 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 0875732..0875732 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 dcd4943..dcd4943 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 78ed174..78ed174 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 a1f1a13..a1f1a13 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 7a0894c..7a0894c 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 014386e..014386e 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 8e74501..8e74501 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 bb961cb..bb961cb 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 edb051f..edb051f 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 e555e92..e555e92 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 d2d417d..d2d417d 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 0f1c024..0f1c024 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 5727a51..5727a51 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 7638277..7638277 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 9671d86..9671d86 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 fa91e96..fa91e96 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 d899c41..d899c41 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 836593f..836593f 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 e1c77ac..e1c77ac 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 a0ebdf7..a0ebdf7 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 f5571f2..f5571f2 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 4aff7eb..4aff7eb 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 b84434c..b84434c 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 0297cd8..0297cd8 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 5c5b9cd..5c5b9cd 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 96ec4bb..96ec4bb 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 afcdf18..afcdf18 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 a3cc4cf..a3cc4cf 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 404babe..404babe 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 78d7150..78d7150 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 73462ad..73462ad 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 af4c37b..af4c37b 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 6ac8db4..6ac8db4 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 19988c1..19988c1 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 0349061..0349061 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 e9b421e..e9b421e 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 f5968d5..f5968d5 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 2a6721d..2a6721d 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 f32981f..f32981f 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 129f99f..129f99f 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 a07933e..a07933e 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 5eb6ed6..5eb6ed6 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 f21593c..f21593c 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 ff2e3fb..ff2e3fb 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 3424799..3424799 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 019b703..019b703 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 567d303..567d303 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 e6d9b82..e6d9b82 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 f2b4e4b..f2b4e4b 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 2aa81b5..2aa81b5 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 b691473..b691473 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 957a1ff..957a1ff 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 824620d..824620d 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 fba59a5..fba59a5 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 f75822c..f75822c 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 33fe836..33fe836 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 425c525..425c525 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 a976aec..a976aec 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 f8f9d4d..f8f9d4d 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 860bd62..860bd62 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 a14f2c6..a14f2c6 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 49f19e6..49f19e6 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 a7515cd..a7515cd 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 c16d81a..c16d81a 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 3a34f37..3a34f37 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 e5b97a7..e5b97a7 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 7b030e4..7b030e4 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 2606336..2606336 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 2f9d03e..2f9d03e 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 584078d..584078d 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 8cd2f3a..8cd2f3a 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 90e8f9f..90e8f9f 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 afeb47a..afeb47a 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 0b7a11d..0b7a11d 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 c0d7c06..c0d7c06 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 7888d0f..7888d0f 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 801ddca..801ddca 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 a6878d4..a6878d4 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 76adaf4..76adaf4 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 64562fc..64562fc 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 fab5cd8..fab5cd8 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 41092bf..41092bf 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 4ec0db0..4ec0db0 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 9b88e36..9b88e36 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 fc4fcf3..fc4fcf3 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 9d52747..9d52747 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 b563c50..b563c50 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 a95460d..a95460d 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 1d4864d..1d4864d 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 7f5dd02..7f5dd02 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 7461a8e..7461a8e 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 513eb97..513eb97 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 1550c39..1550c39 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 7eec4d0..7eec4d0 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 50dece6..50dece6 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 e639b68..e639b68 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 8657e62..8657e62 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 ffe0ee2..ffe0ee2 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 5b9400d..5b9400d 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 11e5705..11e5705 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 cb78a5c..cb78a5c 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 66abffd..66abffd 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 d8361ad..d8361ad 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 294b62d..294b62d 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 803928c..803928c 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 e7a8426..e7a8426 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 e52a62a..e52a62a 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 7928c6e..7928c6e 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 477d7cd..477d7cd 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 ff75940..ff75940 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 d63fe08..d63fe08 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 7ec5aa6..7ec5aa6 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 ed47838..ed47838 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 6892dc0..6892dc0 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 ee7e0a7..ee7e0a7 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 40e8eeb..40e8eeb 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 b70c760..b70c760 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 9f4f352..9f4f352 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 fc9bd54..fc9bd54 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 ef5f95d..ef5f95d 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 47ddd80..47ddd80 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 fb90a6a..fb90a6a 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 c6a5328..c6a5328 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 d3cf2c4..d3cf2c4 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 f36de10..f36de10 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 7b665ee..7b665ee 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 977c868..977c868 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 97ce879..97ce879 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 6c5828e..6c5828e 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 cbe127f..cbe127f 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 d57d3ef..d57d3ef 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 bab3259..bab3259 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 6d7dd31..6d7dd31 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 28c2ae1..28c2ae1 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 38b3c3f..38b3c3f 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 4d61919..4d61919 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 b5f6eaa..b5f6eaa 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 f9764b5..f9764b5 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 8d58a18..8d58a18 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 3e00bc6..3e00bc6 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 365210d..365210d 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 1a80a6d..1a80a6d 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 0c834d1..0c834d1 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 b440afb..b440afb 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 46601e4..46601e4 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 5d516aa..5d516aa 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 b440afb..b440afb 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 1a87cb3..1a87cb3 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 bb0c9dc..bb0c9dc 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 1ba445e..1ba445e 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 880d6e4..880d6e4 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 62dca84..62dca84 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 393b615..393b615 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 2418c7c..2418c7c 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 393b615..393b615 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 4cb4626..4cb4626 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 ead97bd..ead97bd 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/ChangeLog +++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp index 3d9cb9d..3d9cb9d 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h index 5563e26..5563e26 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp index 5e2acd2..5e2acd2 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h index 40624358..40624358 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp index e00443d..e00443d 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp +++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h index a8aba5c..a8aba5c 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h +++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp index 6b86232..6b86232 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp +++ b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h index 7d6af6c..7d6af6c 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h +++ b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp index 14bde38..14bde38 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp +++ b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h index e88fd89..e88fd89 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h +++ b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js index de2072a..de2072a 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js +++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js index f96be0b..f96be0b 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js +++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json index 1319cdf..1319cdf 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json +++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js index d0f9cb4..d0f9cb4 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js +++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js index 61fa2f7..61fa2f7 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js +++ b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp index 4b339ca..4b339ca 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp +++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h index 8ad44f8..8ad44f8 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h +++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp index 0693eb0..0693eb0 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h index fdad347..fdad347 100755..100644 --- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h +++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h diff --git a/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h b/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h index b7fdc15..b7fdc15 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h +++ b/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png Binary files differindex d04df37..d04df37 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png +++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png Binary files differindex e824a21..e824a21 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png +++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png Binary files differindex 01ce692..01ce692 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png +++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png Binary files differindex b98fb36..b98fb36 100755..100644 --- a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png +++ b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png Binary files differindex 035aeb2..035aeb2 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 d9bb5b5..4103552 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 0631df8..5a2d051 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 868cd92..1fbf69c 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 52e3046..c3362ae 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 c7ba80d..c7ba80d 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 b954e5a..b954e5a 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 8065025..da09a9c 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 56f66b4..ded1701 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 dedc462..dedc462 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 021eed2..021eed2 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 d5281f4..d5281f4 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 7fbd802..7fbd802 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 462edac..462edac 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 f8061a1..f8061a1 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 1297ec7..1297ec7 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 4aa9fb5..4aa9fb5 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 23ec56b..23ec56b 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 cca212e..9754a84 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 a8b6c08..34ca5d4 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 99be1eb..99be1eb 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 76cc0b9..76cc0b9 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 720b39d..720b39d 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 3762842..3762842 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 91f174a..91f174a 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 6da6cdd..6da6cdd 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 cc7907d..cc7907d 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 5153d25..5153d25 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 8ea446a..8ea446a 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 9cc837d..9cc837d 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 7a763a8..7a763a8 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 1662ae5..1662ae5 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 1a9b1b3..1a9b1b3 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 03c0f16..03c0f16 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 0436b8c..0436b8c 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 b55430b..b55430b 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 4e277e6..4e277e6 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 ee426a0..ee426a0 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 95ee7f7..95ee7f7 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 fe9f8fc..fe9f8fc 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 36cf147..36cf147 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 c869d7b..c869d7b 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 f750ffb..f750ffb 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 61b1de6..61b1de6 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 d79b60b..d79b60b 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 b197dcb..b197dcb 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 e3b073e..e3b073e 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 6fbe85e..6fbe85e 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 f303199..f303199 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 fd47d5d..fd47d5d 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 8f387c1..8f387c1 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 99af0f8..99af0f8 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 05f9622..05f9622 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 64e4268..64e4268 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 d5af3b8..d5af3b8 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 7800556..7800556 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 e159c4c..e159c4c 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 10ee26f..10ee26f 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 e3fa070..e3fa070 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 2897ece..2897ece 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 d396200..d396200 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 0473fe4..0473fe4 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 5d3307e..5d3307e 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 c48565b..c48565b 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 671face..671face 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 eebd421..eebd421 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 d68b86c..d68b86c 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 9d46235..9d46235 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 2e3d044..2e3d044 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 dd2f540..dd2f540 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 8680b7b..8680b7b 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 a24a07b..a24a07b 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 a9b00d3..a9b00d3 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 b097fbc..b097fbc 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 41ebf0a..41ebf0a 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 dfd53a9..dfd53a9 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 923c1e5..923c1e5 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 236eb00..236eb00 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 6e7339f..6e7339f 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 437dcbd..437dcbd 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 3cd858e..3cd858e 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 ffc5c5a..ffc5c5a 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 0c78a37..0c78a37 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 6e735fd..6e735fd 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 f57f3a4..f57f3a4 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 1f21d19..1f21d19 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 ecd5a2d..ecd5a2d 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 1be1997..1be1997 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 97c3ca3..97c3ca3 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 e1ebdb6..e1ebdb6 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 003cd0f..003cd0f 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 733cd71..733cd71 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 9610238..9610238 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 368fde1..368fde1 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 bb10ac6..bb10ac6 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 0e3c4b0..0e3c4b0 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 2339522..2339522 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 f941cb7..f941cb7 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 b69e9d0..b69e9d0 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 d7074d9..d7074d9 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 85e6848..85e6848 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 5d15ce3..5d15ce3 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 a5f5fb7..a5f5fb7 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 40c7e8d..40c7e8d 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 9966269..9966269 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 446adb9..446adb9 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 4dedd5a..4dedd5a 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 f388f19..f388f19 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 c37a4ea..be991dc 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 1cff3fd..1cff3fd 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 45f6d8e..45f6d8e 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 3436f20..3436f20 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 c6e97f8..c6e97f8 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 4df2f0c..4df2f0c 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 ab1d696..ab1d696 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 c6ca61f..c6ca61f 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 67c3297..67c3297 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 b19be3a..b19be3a 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 8eb1fb9..8eb1fb9 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 7f25c50..7f25c50 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 470fd6f..470fd6f 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 86a8679..86a8679 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 67c3297..67c3297 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 931f3ad..931f3ad 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 40f7ff5..40f7ff5 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 61def75c..61def75c 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 ade9599..ade9599 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 bef50b1..bef50b1 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 8f305a8..8f305a8 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 fbf4ca4..fbf4ca4 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 fbf4ca4..fbf4ca4 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 fbf4ca4..fbf4ca4 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 52a28f5..52a28f5 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 fbf4ca4..fbf4ca4 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 7e372e6..7e372e6 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 a3691d9..a3691d9 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 6eaf779..6eaf779 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 00d2f30..00d2f30 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 bf77ef8..bf77ef8 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 ffd9add..ffd9add 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 2d46f76..2d46f76 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 d18201a..d18201a 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 815291c..815291c 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 9f8f2af..9f8f2af 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 26f2d8b..26f2d8b 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 e326881..e326881 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 aa6d0ec..aa6d0ec 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 389d259..389d259 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 bdc93af..bdc93af 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 712cce3..712cce3 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 ac249d7..ac249d7 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 df94df5..df94df5 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 e386446..e386446 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 f7f94ab..f7f94ab 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 bef50b1..bef50b1 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 17d164d..17d164d 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 2e0f6a1..2e0f6a1 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 3474dd0..3474dd0 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 f9f92a4..f9f92a4 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 b8a15ae..b8a15ae 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 4a9b283..4a9b283 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 b242d60..b242d60 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 3005133..3005133 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 f3024f7..f3024f7 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 144c02d..144c02d 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 c73d389..c73d389 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 b226773..b226773 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 5bc7b58..5bc7b58 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 87c2f4a..2888290 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 21b3405..0fbf658 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 29df673..042ef3d 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 1f6f1f5..c6d9201 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 bc617a9..9c49183 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 90b1da1..90b1da1 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 5a9673d..5a9673d 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 f0fb121..f0fb121 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 3322f92..3322f92 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 0ded551..0ded551 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 7561b4e..7561b4e 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 a84845e..a84845e 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 3a38d99..3a38d99 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 100fe91..100fe91 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 9b3bd99..9b3bd99 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 3a48b21..3a48b21 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 af204d8..af204d8 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 0c7294c..0c7294c 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 4f523b9..9647704 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 ca52a7a..48d1b02 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"); |
