From 287c150aac9e4892801b6117fb6fa11a616b05a1 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Thu, 27 Oct 2011 13:42:51 +0200 Subject: Notify X11 of its resizable state through MWM Hints. We only updated the MWM_FUNC_RESIZE when the window was shown. The consequence was that if the widget was initially shown in fixed size it would clear the MWM_FUNC_RESIZE flag, and we would never set it again if the widget became resizable later. Some window managers still support this (apparently it seems that compiz tried to adhere to this) Task-number: QTBUG-21914 Reviewed-by: Denis Dzyubenko --- src/gui/kernel/qwidget_x11.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index f99cc2c..98c33da 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -2694,8 +2694,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 -- cgit v0.12 From 546efb2cdb64e968e3376a2d426e653e4da4f5d2 Mon Sep 17 00:00:00 2001 From: John Tapsell Date: Mon, 7 Nov 2011 17:07:27 +0100 Subject: QGraphicsLayoutItem - bound constraint the minimum and maximum size The scenario was this: If you had a height for width item, and that item had a maximum width of 50. If you called item->effectiveSizeHint(Qt::PreferredSize, QSizeF(100,-1)); it would return (100, ?), thus violating its own maximum width. Merge-request: 1423 Reviewed-by: Jan-Arve Saether --- src/gui/graphicsview/qgraphicslayoutitem.cpp | 70 ++++++++++++- .../tst_qgraphicslayoutitem.cpp | 108 +++++++++++++++++++++ 2 files changed, 176 insertions(+), 2 deletions(-) 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/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 #include #include +#include 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("minimumSize"); + QTest::addColumn("preferredSize"); + QTest::addColumn("maximumSize"); + QTest::addColumn("minimumSizeHint"); + QTest::addColumn("preferredSizeHint"); + QTest::addColumn("maximumSizeHint"); + + QTest::addColumn("inputConstraint"); + QTest::addColumn("expectedMinimumESH"); + QTest::addColumn("expectedPreferredESH"); + QTest::addColumn("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() { -- cgit v0.12 From fea7c172500811c7ab69f25b8d317890712cf5e8 Mon Sep 17 00:00:00 2001 From: Jani Hyvonen Date: Tue, 22 Nov 2011 16:26:32 +0200 Subject: Fixing memory leak in QtGui qt_cleanup In qt_cleanup() the S60->setButtonGroupContainer(0) - which sets the QS60Data::cba to zero - is called before calling delete S60->buttonGroupContainer(). Because of this the currently set QS60Data::cba gets never deleted. A call S60->setButtonGroupContainer(0) which sets the QS60Data::cba pointer to zero is now called after calling the delete S60->buttonGroupContainer(). Task-number: QTBUG-22741 Reviewed-by: Murray Read --- src/gui/kernel/qapplication_s60.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index bb84491..ca9c3a3 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2069,9 +2069,6 @@ extern void qt_cleanup_symbianFontDatabase(); // qfontdatabase_s60.cpp *****************************************************************************/ void qt_cleanup() { -#ifdef Q_WS_S60 - S60->setButtonGroupContainer(0); -#endif if(qt_S60Beep) { delete qt_S60Beep; qt_S60Beep = 0; -- cgit v0.12 From 6f94f2a7f824e2c586390ae831dd638c8c71faeb Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 22 Nov 2011 16:42:49 +0100 Subject: Fix permission (no execute bit). --- .hgignore | 0 config.profiles/harmattan/rules | 0 config.profiles/harmattan/tests/create_tests_xml | 0 config.tests/mac/crc.test | 0 config.tests/mac/defaultarch.test | 0 config.tests/mac/dwarf2.test | 0 config.tests/mac/xarch.test | 0 config.tests/symbian/compile.test | 0 config.tests/unix/bsymbolic_functions.test | 0 config.tests/unix/compile.test | 0 config.tests/unix/doubleformat.test | 0 config.tests/unix/endian.test | 0 config.tests/unix/fvisibility.test | 0 config.tests/unix/makeabs | 0 config.tests/unix/objcopy.test | 0 config.tests/unix/padstring | 0 config.tests/unix/precomp.test | 0 config.tests/unix/ptrsize.test | 0 config.tests/unix/which.test | 0 config.tests/x11/notype.test | 0 demos/declarative/samegame/SamegameCore/samegame.js | 0 demos/declarative/samegame/highscores/score_data.xml | 0 demos/declarative/samegame/highscores/score_style.xsl | 0 demos/declarative/samegame/highscores/scores.php | 0 demos/embedded/styledemo/files/add.png | Bin demos/embedded/styledemo/files/remove.png | Bin demos/mobile/qcamera/businesscardhandling.cpp | 0 demos/mobile/qcamera/businesscardhandling.h | 0 demos/mobile/qcamera/button.cpp | 0 demos/mobile/qcamera/button.h | 0 demos/mobile/qcamera/cameraexample.cpp | 0 demos/mobile/qcamera/cameraexample.h | 0 demos/mobile/qcamera/contactsdlg.cpp | 0 demos/mobile/qcamera/contactsdlg.h | 0 demos/mobile/qcamera/icons/camera.png | Bin demos/mobile/qcamera/icons/cameramms_icon.svg | 0 demos/mobile/qcamera/icons/exit.png | Bin demos/mobile/qcamera/icons/mms.png | Bin demos/mobile/qcamera/main.cpp | 0 demos/mobile/qcamera/messagehandling.cpp | 0 demos/mobile/qcamera/messagehandling.h | 0 demos/mobile/qcamera/qcamera.pro | 0 demos/mobile/qcamera/resources.qrc | 0 demos/qtdemo/images/demobg.png | Bin doc/src/images/audiodevices-example.png | Bin doc/src/images/audiooutput-example.png | Bin doc/src/images/clock.png | Bin doc/src/images/dummy_tree.png | Bin doc/src/images/edit.png | Bin doc/src/images/example_model.png | Bin doc/src/images/lineedit.png | Bin doc/src/images/list_table_tree.png | Bin doc/src/images/listview.png | Bin doc/src/images/lotto.png | Bin doc/src/images/modelview-combobox.png | Bin doc/src/images/modelview-header.png | Bin doc/src/images/modelview.png | Bin doc/src/images/path.png | Bin doc/src/images/qcompleter.png | Bin doc/src/images/readonlytable.png | Bin doc/src/images/readonlytable_role.png | Bin doc/src/images/selection2.png | Bin doc/src/images/standardwidget.png | Bin doc/src/images/tableview.png | Bin doc/src/images/tree.png | Bin doc/src/images/tree_2.png | Bin doc/src/images/tree_2_with_algorithm.png | Bin doc/src/images/tree_city.png | Bin doc/src/images/treeview.png | Bin doc/src/images/treeview_sml.png | Bin doc/src/images/widgetmapper.png | Bin doc/src/template/images/bg_l.png | Bin doc/src/template/images/bg_l_blank.png | Bin doc/src/template/images/bg_r.png | Bin doc/src/template/images/box_bg.png | Bin doc/src/template/images/breadcrumb.png | Bin doc/src/template/images/bullet_gt.png | Bin doc/src/template/images/bullet_sq.png | Bin doc/src/template/images/feedbackground.png | Bin doc/src/template/images/horBar.png | Bin doc/src/template/images/page_bg.png | Bin doc/src/template/images/sprites-combined.png | Bin doc/src/template/scripts/functions.js | 0 doc/src/template/scripts/jquery.js | 0 doc/src/template/style/style.css | 0 doc/src/template/style/style_ie6.css | 0 doc/src/template/style/style_ie7.css | 0 doc/src/template/style/style_ie8.css | 0 .../property-animation/qtc_packaging/debian_fremantle/rules | 0 .../borderimage/qtc_packaging/debian_fremantle/rules | 0 .../expandingdelegates/qtc_packaging/debian_fremantle/rules | 0 .../listview/highlight/qtc_packaging/debian_fremantle/rules | 0 .../pathview-example/qtc_packaging/debian_fremantle/rules | 0 .../webview/autosize/qtc_packaging/debian_fremantle/rules | 0 .../webview/googlemaps/qtc_packaging/debian_fremantle/rules | 0 .../webview/inlinehtml/qtc_packaging/debian_fremantle/rules | 0 examples/declarative/shadereffects/main.cpp | 0 examples/declarative/shadereffects/qml/Curtain.qml | 0 examples/declarative/shadereffects/qml/CurtainEffect.qml | 0 examples/declarative/shadereffects/qml/DropShadow.qml | 0 examples/declarative/shadereffects/qml/DropShadowEffect.qml | 0 examples/declarative/shadereffects/qml/Grayscale.qml | 0 examples/declarative/shadereffects/qml/GrayscaleEffect.qml | 0 examples/declarative/shadereffects/qml/ImageMask.qml | 0 examples/declarative/shadereffects/qml/ImageMaskEffect.qml | 0 examples/declarative/shadereffects/qml/RadialWave.qml | 0 examples/declarative/shadereffects/qml/RadialWaveEffect.qml | 0 examples/declarative/shadereffects/qml/Water.qml | 0 examples/declarative/shadereffects/qml/WaterEffect.qml | 0 examples/declarative/shadereffects/qml/images/Curtain.jpg | Bin .../declarative/shadereffects/qml/images/DropShadow.jpg | Bin examples/declarative/shadereffects/qml/images/Grayscale.jpg | Bin examples/declarative/shadereffects/qml/images/ImageMask.jpg | Bin .../declarative/shadereffects/qml/images/RadialWave.jpg | Bin examples/declarative/shadereffects/qml/images/Water.jpg | Bin examples/declarative/shadereffects/qml/images/back.png | Bin examples/declarative/shadereffects/qml/images/bg.jpg | Bin .../declarative/shadereffects/qml/images/desaturate.jpg | Bin .../declarative/shadereffects/qml/images/drop_shadow.png | Bin examples/declarative/shadereffects/qml/images/fabric.jpg | Bin examples/declarative/shadereffects/qml/images/flower.png | Bin examples/declarative/shadereffects/qml/images/image1.jpg | Bin examples/declarative/shadereffects/qml/images/image2.jpg | Bin examples/declarative/shadereffects/qml/images/qt-logo.png | Bin .../declarative/shadereffects/qml/images/shader_effects.jpg | Bin examples/declarative/shadereffects/qml/images/sky.jpg | Bin examples/declarative/shadereffects/qml/images/toolbar.png | Bin examples/declarative/shadereffects/qml/images/wave.jpg | Bin examples/declarative/shadereffects/qml/main.qml | 0 examples/declarative/shadereffects/shadereffects.pro | 0 .../tutorials/samegame/samegame4/content/samegame.js | 0 .../tutorials/samegame/samegame4/highscores/score_data.xml | 0 .../tutorials/samegame/samegame4/highscores/score_style.xsl | 0 .../tutorials/samegame/samegame4/highscores/scores.php | 0 .../slideswitch/qtc_packaging/debian_fremantle/rules | 0 examples/network/bearercloud/lan.svg | 0 examples/tutorials/gettingStarted/gsQt/gsqt.pro | 0 examples/tutorials/gettingStarted/gsQt/part1/main.cpp | 0 examples/tutorials/gettingStarted/gsQt/part1/part1.pro | 0 examples/tutorials/gettingStarted/gsQt/part2/main.cpp | 0 examples/tutorials/gettingStarted/gsQt/part2/part2.pro | 0 examples/tutorials/gettingStarted/gsQt/part3/main.cpp | 0 examples/tutorials/gettingStarted/gsQt/part3/part3.pro | 0 examples/tutorials/gettingStarted/gsQt/part4/main.cpp | 0 examples/tutorials/gettingStarted/gsQt/part4/part4.pro | 0 examples/tutorials/gettingStarted/gsQt/part5/main.cpp | 0 examples/tutorials/gettingStarted/gsQt/part5/part5.pro | 0 examples/tutorials/modelview/1_readonly/1_readonly.pro | 0 examples/tutorials/modelview/1_readonly/main.cpp | 0 examples/tutorials/modelview/1_readonly/mymodel.cpp | 0 examples/tutorials/modelview/1_readonly/mymodel.h | 0 examples/tutorials/modelview/2_formatting/2_formatting.pro | 0 examples/tutorials/modelview/2_formatting/main.cpp | 0 examples/tutorials/modelview/2_formatting/mymodel.cpp | 0 examples/tutorials/modelview/2_formatting/mymodel.h | 0 .../tutorials/modelview/3_changingmodel/3_changingmodel.pro | 0 examples/tutorials/modelview/3_changingmodel/main.cpp | 0 examples/tutorials/modelview/3_changingmodel/mymodel.cpp | 0 examples/tutorials/modelview/3_changingmodel/mymodel.h | 0 examples/tutorials/modelview/4_headers/4_headers.pro | 0 examples/tutorials/modelview/4_headers/main.cpp | 0 examples/tutorials/modelview/4_headers/mymodel.cpp | 0 examples/tutorials/modelview/4_headers/mymodel.h | 0 examples/tutorials/modelview/5_edit/5_edit.pro | 0 examples/tutorials/modelview/5_edit/main.cpp | 0 examples/tutorials/modelview/5_edit/mainwindow.cpp | 0 examples/tutorials/modelview/5_edit/mainwindow.h | 0 examples/tutorials/modelview/5_edit/mymodel.cpp | 0 examples/tutorials/modelview/5_edit/mymodel.h | 0 examples/tutorials/modelview/6_treeview/6_treeview.pro | 0 examples/tutorials/modelview/6_treeview/main.cpp | 0 examples/tutorials/modelview/6_treeview/mainwindow.cpp | 0 examples/tutorials/modelview/6_treeview/mainwindow.h | 0 examples/tutorials/modelview/7_selections/7_selections.pro | 0 examples/tutorials/modelview/7_selections/main.cpp | 0 examples/tutorials/modelview/7_selections/mainwindow.cpp | 0 examples/tutorials/modelview/7_selections/mainwindow.h | 0 examples/tutorials/modelview/modelview.pro | 0 examples/tutorials/threads/clock/clock.pro | 0 examples/tutorials/threads/clock/main.cpp | 0 .../tutorials/threads/helloconcurrent/helloconcurrent.cpp | 0 .../tutorials/threads/helloconcurrent/helloconcurrent.pro | 0 examples/tutorials/threads/hellothread/hellothread.cpp | 0 examples/tutorials/threads/hellothread/hellothread.h | 0 examples/tutorials/threads/hellothread/hellothread.pro | 0 examples/tutorials/threads/hellothread/main.cpp | 0 .../tutorials/threads/hellothreadpool/hellothreadpool.cpp | 0 .../tutorials/threads/hellothreadpool/hellothreadpool.pro | 0 examples/tutorials/threads/movedobject/main.cpp | 0 examples/tutorials/threads/movedobject/movedobject.pro | 0 examples/webkit/formextractor/form.html | 0 examples/webkit/webkit-guide/css/anim_accord.css | 0 examples/webkit/webkit-guide/css/anim_demo-rotate.css | 0 examples/webkit/webkit-guide/css/anim_demo-scale.css | 0 examples/webkit/webkit-guide/css/anim_demo-skew.css | 0 examples/webkit/webkit-guide/css/anim_gallery.css | 0 examples/webkit/webkit-guide/css/anim_panel.css | 0 examples/webkit/webkit-guide/css/anim_pulse.css | 0 examples/webkit/webkit-guide/css/anim_skew.css | 0 examples/webkit/webkit-guide/css/anim_slide.css | 0 examples/webkit/webkit-guide/css/anim_tabbedSkew.css | 0 examples/webkit/webkit-guide/css/css3_backgrounds.css | 0 examples/webkit/webkit-guide/css/css3_border-img.css | 0 examples/webkit/webkit-guide/css/css3_grad-radial.css | 0 examples/webkit/webkit-guide/css/css3_gradientBack.css | 0 examples/webkit/webkit-guide/css/css3_gradientBackStop.css | 0 examples/webkit/webkit-guide/css/css3_gradientButton.css | 0 examples/webkit/webkit-guide/css/css3_mask-grad.css | 0 examples/webkit/webkit-guide/css/css3_mask-img.css | 0 examples/webkit/webkit-guide/css/css3_multicol.css | 0 examples/webkit/webkit-guide/css/css3_reflect.css | 0 examples/webkit/webkit-guide/css/css3_scroll.css | 0 examples/webkit/webkit-guide/css/css3_sel-nth.css | 0 examples/webkit/webkit-guide/css/css3_shadow.css | 0 examples/webkit/webkit-guide/css/css3_shadowBlur.css | 0 examples/webkit/webkit-guide/css/css3_text-overflow.css | 0 examples/webkit/webkit-guide/css/css3_text-shadow.css | 0 examples/webkit/webkit-guide/css/css3_text-stroke.css | 0 examples/webkit/webkit-guide/css/form_tapper.css | 0 examples/webkit/webkit-guide/css/form_toggler.css | 0 examples/webkit/webkit-guide/css/layout_link-fmt.css | 0 examples/webkit/webkit-guide/css/layout_tbl-keyhole.css | 0 examples/webkit/webkit-guide/css/mob_condjs.css | 0 examples/webkit/webkit-guide/css/mob_mediaquery.css | 0 examples/webkit/webkit-guide/css/mobile.css | 0 examples/webkit/webkit-guide/css/mq_desktop.css | 0 examples/webkit/webkit-guide/css/mq_mobile.css | 0 examples/webkit/webkit-guide/css/mq_touch.css | 0 examples/webkit/webkit-guide/css/mqlayout_desktop.css | 0 examples/webkit/webkit-guide/css/mqlayout_mobile.css | 0 examples/webkit/webkit-guide/css/mqlayout_touch.css | 0 examples/webkit/webkit-guide/css/storage.css | 0 examples/webkit/webkit-guide/img/border-frame.png | Bin examples/webkit/webkit-guide/img/gradient.jpg | Bin examples/webkit/webkit-guide/img/gray_icon_close.png | Bin examples/webkit/webkit-guide/img/ic_ag_016.png | Bin examples/webkit/webkit-guide/img/ic_ag_032.png | Bin examples/webkit/webkit-guide/img/ic_ag_036.png | Bin examples/webkit/webkit-guide/img/ic_ag_048.png | Bin examples/webkit/webkit-guide/img/ic_al_016.png | Bin examples/webkit/webkit-guide/img/ic_al_032.png | Bin examples/webkit/webkit-guide/img/ic_al_036.png | Bin examples/webkit/webkit-guide/img/ic_al_048.png | Bin examples/webkit/webkit-guide/img/ic_ar_016.png | Bin examples/webkit/webkit-guide/img/ic_ar_032.png | Bin examples/webkit/webkit-guide/img/ic_ar_036.png | Bin examples/webkit/webkit-guide/img/ic_ar_048.png | Bin examples/webkit/webkit-guide/img/ic_b_016.png | Bin examples/webkit/webkit-guide/img/ic_b_032.png | Bin examples/webkit/webkit-guide/img/ic_b_036.png | Bin examples/webkit/webkit-guide/img/ic_b_048.png | Bin examples/webkit/webkit-guide/img/ic_be_016.png | Bin examples/webkit/webkit-guide/img/ic_be_032.png | Bin examples/webkit/webkit-guide/img/ic_be_036.png | Bin examples/webkit/webkit-guide/img/ic_be_048.png | Bin examples/webkit/webkit-guide/img/ic_c_016.png | Bin examples/webkit/webkit-guide/img/ic_c_032.png | Bin examples/webkit/webkit-guide/img/ic_c_036.png | Bin examples/webkit/webkit-guide/img/ic_c_048.png | Bin examples/webkit/webkit-guide/img/ic_ca_016.png | Bin examples/webkit/webkit-guide/img/ic_ca_032.png | Bin examples/webkit/webkit-guide/img/ic_ca_036.png | Bin examples/webkit/webkit-guide/img/ic_ca_048.png | Bin examples/webkit/webkit-guide/img/ic_cl_016.png | Bin examples/webkit/webkit-guide/img/ic_cl_032.png | Bin examples/webkit/webkit-guide/img/ic_cl_036.png | Bin examples/webkit/webkit-guide/img/ic_cl_048.png | Bin examples/webkit/webkit-guide/img/ic_cu_016.png | Bin examples/webkit/webkit-guide/img/ic_cu_032.png | Bin examples/webkit/webkit-guide/img/ic_cu_036.png | Bin examples/webkit/webkit-guide/img/ic_cu_048.png | Bin examples/webkit/webkit-guide/img/ic_f_016.png | Bin examples/webkit/webkit-guide/img/ic_f_032.png | Bin examples/webkit/webkit-guide/img/ic_f_036.png | Bin examples/webkit/webkit-guide/img/ic_f_048.png | Bin examples/webkit/webkit-guide/img/ic_fe_016.png | Bin examples/webkit/webkit-guide/img/ic_fe_032.png | Bin examples/webkit/webkit-guide/img/ic_fe_036.png | Bin examples/webkit/webkit-guide/img/ic_fe_048.png | Bin examples/webkit/webkit-guide/img/ic_h_016.png | Bin examples/webkit/webkit-guide/img/ic_h_032.png | Bin examples/webkit/webkit-guide/img/ic_h_036.png | Bin examples/webkit/webkit-guide/img/ic_h_048.png | Bin examples/webkit/webkit-guide/img/ic_he_016.png | Bin examples/webkit/webkit-guide/img/ic_he_032.png | Bin examples/webkit/webkit-guide/img/ic_he_036.png | Bin examples/webkit/webkit-guide/img/ic_he_048.png | Bin examples/webkit/webkit-guide/img/ic_k_016.png | Bin examples/webkit/webkit-guide/img/ic_k_032.png | Bin examples/webkit/webkit-guide/img/ic_k_036.png | Bin examples/webkit/webkit-guide/img/ic_k_048.png | Bin examples/webkit/webkit-guide/img/ic_li_016.png | Bin examples/webkit/webkit-guide/img/ic_li_032.png | Bin examples/webkit/webkit-guide/img/ic_li_036.png | Bin examples/webkit/webkit-guide/img/ic_li_048.png | Bin examples/webkit/webkit-guide/img/ic_mg_016.png | Bin examples/webkit/webkit-guide/img/ic_mg_032.png | Bin examples/webkit/webkit-guide/img/ic_mg_036.png | Bin examples/webkit/webkit-guide/img/ic_mg_048.png | Bin examples/webkit/webkit-guide/img/ic_n_016.png | Bin examples/webkit/webkit-guide/img/ic_n_032.png | Bin examples/webkit/webkit-guide/img/ic_n_036.png | Bin examples/webkit/webkit-guide/img/ic_n_048.png | Bin examples/webkit/webkit-guide/img/ic_na_016.png | Bin examples/webkit/webkit-guide/img/ic_na_032.png | Bin examples/webkit/webkit-guide/img/ic_na_036.png | Bin examples/webkit/webkit-guide/img/ic_na_048.png | Bin examples/webkit/webkit-guide/img/ic_ne_016.png | Bin examples/webkit/webkit-guide/img/ic_ne_032.png | Bin examples/webkit/webkit-guide/img/ic_ne_036.png | Bin examples/webkit/webkit-guide/img/ic_ne_048.png | Bin examples/webkit/webkit-guide/img/ic_ni_016.png | Bin examples/webkit/webkit-guide/img/ic_ni_032.png | Bin examples/webkit/webkit-guide/img/ic_ni_036.png | Bin examples/webkit/webkit-guide/img/ic_ni_048.png | Bin examples/webkit/webkit-guide/img/ic_o_016.png | Bin examples/webkit/webkit-guide/img/ic_o_032.png | Bin examples/webkit/webkit-guide/img/ic_o_036.png | Bin examples/webkit/webkit-guide/img/ic_o_048.png | Bin examples/webkit/webkit-guide/img/ic_pt_016.png | Bin examples/webkit/webkit-guide/img/ic_pt_032.png | Bin examples/webkit/webkit-guide/img/ic_pt_036.png | Bin examples/webkit/webkit-guide/img/ic_pt_048.png | Bin examples/webkit/webkit-guide/img/ic_si_016.png | Bin examples/webkit/webkit-guide/img/ic_si_032.png | Bin examples/webkit/webkit-guide/img/ic_si_036.png | Bin examples/webkit/webkit-guide/img/ic_si_048.png | Bin examples/webkit/webkit-guide/img/ic_zn_016.png | Bin examples/webkit/webkit-guide/img/ic_zn_032.png | Bin examples/webkit/webkit-guide/img/ic_zn_036.png | Bin examples/webkit/webkit-guide/img/ic_zn_048.png | Bin examples/webkit/webkit-guide/img/icon_check.png | Bin examples/webkit/webkit-guide/img/icon_check_x24green.png | Bin examples/webkit/webkit-guide/img/icon_dismiss.png | Bin examples/webkit/webkit-guide/img/icon_dismiss_x22.png | Bin examples/webkit/webkit-guide/img/icon_drill-down.png | Bin examples/webkit/webkit-guide/img/icon_drill-down_x32.png | Bin examples/webkit/webkit-guide/img/icon_drill-up.png | Bin examples/webkit/webkit-guide/img/icon_drill-up_x32.png | Bin examples/webkit/webkit-guide/img/icon_expand-nav.png | Bin examples/webkit/webkit-guide/img/icon_head-collapsed.png | Bin .../webkit/webkit-guide/img/icon_head-collapsed_x13.png | Bin examples/webkit/webkit-guide/img/icon_head-expanded.png | Bin examples/webkit/webkit-guide/img/icon_head-expanded_x13.png | Bin examples/webkit/webkit-guide/img/icon_info.png | Bin examples/webkit/webkit-guide/img/icon_info_x24.png | Bin examples/webkit/webkit-guide/img/icon_link-doc.png | Bin examples/webkit/webkit-guide/img/icon_link-email.png | Bin examples/webkit/webkit-guide/img/icon_link-external.png | Bin examples/webkit/webkit-guide/img/icon_link-pdf.png | Bin examples/webkit/webkit-guide/img/icon_link-ppt.png | Bin examples/webkit/webkit-guide/img/icon_link-rss.png | Bin examples/webkit/webkit-guide/img/icon_link-sms.png | Bin examples/webkit/webkit-guide/img/icon_link-tel.png | Bin examples/webkit/webkit-guide/img/icon_link-xls.png | Bin examples/webkit/webkit-guide/img/icon_list-all.png | Bin examples/webkit/webkit-guide/img/icon_list-all_circ.png | Bin examples/webkit/webkit-guide/img/icon_nav-start.png | Bin examples/webkit/webkit-guide/img/icon_nav-top.png | Bin examples/webkit/webkit-guide/img/icon_nav-up.png | Bin examples/webkit/webkit-guide/img/icon_nav_end.png | Bin examples/webkit/webkit-guide/img/icon_question.png | Bin examples/webkit/webkit-guide/img/icon_scroll-left.png | Bin examples/webkit/webkit-guide/img/icon_scroll-right.png | Bin examples/webkit/webkit-guide/img/icon_trash.png | Bin examples/webkit/webkit-guide/img/mask.png | Bin examples/webkit/webkit-guide/js/anim_accord.js | 0 examples/webkit/webkit-guide/js/anim_gallery.js | 0 examples/webkit/webkit-guide/js/anim_panel.js | 0 examples/webkit/webkit-guide/js/anim_skew.js | 0 examples/webkit/webkit-guide/js/css3_backgrounds.js | 0 examples/webkit/webkit-guide/js/css3_border-img.js | 0 examples/webkit/webkit-guide/js/css3_grad-radial.js | 0 examples/webkit/webkit-guide/js/css3_mask-grad.js | 0 examples/webkit/webkit-guide/js/css3_mask-img.js | 0 examples/webkit/webkit-guide/js/css3_text-overflow.js | 0 examples/webkit/webkit-guide/js/form_tapper.js | 0 examples/webkit/webkit-guide/js/mob_condjs.js | 0 examples/webkit/webkit-guide/js/mobile.js | 0 examples/webkit/webkit-guide/js/storage.js | 0 mkspecs/macx-pbuilder/Info.plist.app | 0 mkspecs/macx-pbuilder/qmake.conf | 0 mkspecs/macx-xcode/Info.plist.app | 0 mkspecs/macx-xcode/qmake.conf | 0 src/imports/shaders/glfunctions.h | 0 src/imports/shaders/shadereffectitem.cpp | 0 .../flickrdemo/flickrdemo.xcodeproj/project.pbxproj | 0 .../examples/qmltest/qmltest.xcodeproj/project.pbxproj | 0 src/s60installs/s60installs.pro | 0 .../qdeclarativespringanimation/content/center.png | Bin .../qmlvisual/qdeclarativespringanimation/content/clock.png | Bin .../qmlvisual/qdeclarativespringanimation/content/hour.png | Bin .../qdeclarativespringanimation/content/minute.png | Bin .../qdeclarativespringanimation/content/second.png | Bin tests/auto/mediaobject/mediaobject.pro | 0 tests/auto/qimagereader/images/txts.png | Bin tests/auto/qlocalsocket/lackey/scripts/client.js | 0 .../auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js | 0 .../tests/ecma/ExecutionContexts/10.1.3-2.js | 0 tests/auto/qscriptjstestsuite/tests/ecma/README | 0 tests/auto/qscriptjstestsuite/tests/ecma_2/README | 0 .../tests/ecma_2/extensions/constructor-001.js | 0 .../tests/ecma_2/extensions/function-001.js | 0 .../tests/ecma_2/extensions/instanceof-001.js | 0 .../tests/ecma_2/extensions/instanceof-002.js | 0 .../tests/ecma_2/extensions/instanceof-003-n.js | 0 .../tests/ecma_2/extensions/instanceof-004-n.js | 0 .../tests/ecma_2/extensions/instanceof-005-n.js | 0 .../tests/ecma_2/extensions/instanceof-006.js | 0 .../qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js | 0 .../qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js | 0 .../tests/ecma_3/Array/regress-322135-01.js | 0 .../tests/ecma_3/Array/regress-322135-02.js | 0 .../tests/ecma_3/Array/regress-322135-03.js | 0 .../tests/ecma_3/Array/regress-322135-04.js | 0 .../qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js | 0 .../qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js | 0 .../qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js | 0 .../qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js | 0 .../auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js | 0 tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js | 0 .../qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js | 0 .../tests/ecma_3/ExecutionContexts/10.6.1-01.js | 0 .../tests/ecma_3/ExecutionContexts/regress-448595-01.js | 0 .../qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js | 0 .../qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js | 0 .../qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js | 0 .../tests/ecma_3/Expressions/11.7.1-01.js | 0 .../tests/ecma_3/Expressions/11.7.2-01.js | 0 .../tests/ecma_3/Expressions/11.7.3-01.js | 0 .../tests/ecma_3/Function/arguments-002.js | 0 .../tests/ecma_3/Function/regress-313570.js | 0 .../tests/ecma_3/LexicalConventions/7.9.1.js | 0 .../tests/ecma_3/Number/regress-442242-01.js | 0 .../auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js | 0 .../tests/ecma_3/Object/regress-361274.js | 0 .../tests/ecma_3/Object/regress-385393-07.js | 0 .../tests/ecma_3/Operators/11.13.1-002.js | 0 .../qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js | 0 .../qscriptjstestsuite/tests/ecma_3/Operators/order-01.js | 0 tests/auto/qscriptjstestsuite/tests/ecma_3/README | 0 .../qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js | 0 .../tests/ecma_3/RegExp/regress-285219.js | 0 .../tests/ecma_3/RegExp/regress-289669.js | 0 .../tests/ecma_3/RegExp/regress-307456.js | 0 .../tests/ecma_3/RegExp/regress-309840.js | 0 .../tests/ecma_3/RegExp/regress-311414.js | 0 .../tests/ecma_3/RegExp/regress-312351.js | 0 .../tests/ecma_3/RegExp/regress-330684.js | 0 .../tests/ecma_3/RegExp/regress-334158.js | 0 .../tests/ecma_3/RegExp/regress-346090.js | 0 .../tests/ecma_3/RegExp/regress-367888.js | 0 .../tests/ecma_3/RegExp/regress-375642.js | 0 .../tests/ecma_3/RegExp/regress-375711.js | 0 .../tests/ecma_3/RegExp/regress-375715-01-n.js | 0 .../tests/ecma_3/RegExp/regress-375715-02.js | 0 .../tests/ecma_3/RegExp/regress-375715-03.js | 0 .../tests/ecma_3/RegExp/regress-375715-04.js | 0 .../tests/ecma_3/Regress/regress-385393-04.js | 0 .../tests/ecma_3/Regress/regress-419152.js | 0 .../tests/ecma_3/Regress/regress-420087.js | 0 .../tests/ecma_3/Regress/regress-420610.js | 0 .../tests/ecma_3/Regress/regress-441477-01.js | 0 .../qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js | 0 .../tests/ecma_3/Statements/regress-302439.js | 0 .../tests/ecma_3/Statements/regress-324650.js | 0 .../tests/ecma_3/String/regress-304376.js | 0 .../tests/ecma_3/String/regress-313567.js | 0 .../tests/ecma_3/String/regress-392378.js | 0 .../tests/ecma_3/Unicode/regress-352044-01.js | 0 .../tests/ecma_3/Unicode/regress-352044-02-n.js | 0 tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js | 0 .../qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js | 0 .../qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js | 0 .../tests/ecma_3/extensions/regress-274152.js | 0 .../tests/ecma_3/extensions/regress-320854.js | 0 .../tests/ecma_3/extensions/regress-327170.js | 0 .../tests/ecma_3/extensions/regress-368516.js | 0 .../tests/ecma_3/extensions/regress-385393-03.js | 0 .../tests/ecma_3/extensions/regress-429248.js | 0 .../tests/ecma_3/extensions/regress-430740.js | 0 tests/auto/qscriptjstestsuite/tests/ecma_3/template.js | 0 tests/auto/qsqldatabase/testdata/qtest.mdb | Bin tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent | Bin tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent | Bin tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent | Bin tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent | Bin tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent | 0 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent | 0 tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro | 0 tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 0 tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro | 0 .../declarative/qmlshadersplugin/TestGaussianDropShadow.qml | 0 tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml | 0 .../declarative/qmlshadersplugin/drop_shadow_small.png | Bin tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 0 .../qmlshadersplugin/qml/qmlshadersplugintest/back.svg | 0 .../qml/qmlshadersplugintest/green_image_transparent.png | Bin .../qmlshadersplugin/qml/qmlshadersplugintest/image.png | Bin .../qml/qmlshadersplugintest/image_opaque.png | Bin .../qml/qmlshadersplugintest/image_small.png | Bin .../qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg | Bin tools/qdoc3/doc/config/images/bg_l.png | Bin tools/qdoc3/doc/config/images/bg_l_blank.png | Bin tools/qdoc3/doc/config/images/bg_r.png | Bin tools/qdoc3/doc/config/images/box_bg.png | Bin tools/qdoc3/doc/config/images/breadcrumb.png | Bin tools/qdoc3/doc/config/images/bullet_gt.png | Bin tools/qdoc3/doc/config/images/bullet_sq.png | Bin tools/qdoc3/doc/config/images/feedbackground.png | Bin tools/qdoc3/doc/config/images/horBar.png | Bin tools/qdoc3/doc/config/images/page_bg.png | Bin tools/qdoc3/doc/config/images/sprites-combined.png | Bin tools/qdoc3/doc/config/scripts/functions.js | 0 tools/qdoc3/doc/config/scripts/jquery.js | 0 555 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .hgignore mode change 100755 => 100644 config.profiles/harmattan/rules mode change 100755 => 100644 config.profiles/harmattan/tests/create_tests_xml mode change 100755 => 100644 config.tests/mac/crc.test mode change 100755 => 100644 config.tests/mac/defaultarch.test mode change 100755 => 100644 config.tests/mac/dwarf2.test mode change 100755 => 100644 config.tests/mac/xarch.test mode change 100755 => 100644 config.tests/symbian/compile.test mode change 100755 => 100644 config.tests/unix/bsymbolic_functions.test mode change 100755 => 100644 config.tests/unix/compile.test mode change 100755 => 100644 config.tests/unix/doubleformat.test mode change 100755 => 100644 config.tests/unix/endian.test mode change 100755 => 100644 config.tests/unix/fvisibility.test mode change 100755 => 100644 config.tests/unix/makeabs mode change 100755 => 100644 config.tests/unix/objcopy.test mode change 100755 => 100644 config.tests/unix/padstring mode change 100755 => 100644 config.tests/unix/precomp.test mode change 100755 => 100644 config.tests/unix/ptrsize.test mode change 100755 => 100644 config.tests/unix/which.test mode change 100755 => 100644 config.tests/x11/notype.test mode change 100755 => 100644 demos/declarative/samegame/SamegameCore/samegame.js mode change 100755 => 100644 demos/declarative/samegame/highscores/score_data.xml mode change 100755 => 100644 demos/declarative/samegame/highscores/score_style.xsl mode change 100755 => 100644 demos/declarative/samegame/highscores/scores.php mode change 100755 => 100644 demos/embedded/styledemo/files/add.png mode change 100755 => 100644 demos/embedded/styledemo/files/remove.png mode change 100755 => 100644 demos/mobile/qcamera/businesscardhandling.cpp mode change 100755 => 100644 demos/mobile/qcamera/businesscardhandling.h mode change 100755 => 100644 demos/mobile/qcamera/button.cpp mode change 100755 => 100644 demos/mobile/qcamera/button.h mode change 100755 => 100644 demos/mobile/qcamera/cameraexample.cpp mode change 100755 => 100644 demos/mobile/qcamera/cameraexample.h mode change 100755 => 100644 demos/mobile/qcamera/contactsdlg.cpp mode change 100755 => 100644 demos/mobile/qcamera/contactsdlg.h mode change 100755 => 100644 demos/mobile/qcamera/icons/camera.png mode change 100755 => 100644 demos/mobile/qcamera/icons/cameramms_icon.svg mode change 100755 => 100644 demos/mobile/qcamera/icons/exit.png mode change 100755 => 100644 demos/mobile/qcamera/icons/mms.png mode change 100755 => 100644 demos/mobile/qcamera/main.cpp mode change 100755 => 100644 demos/mobile/qcamera/messagehandling.cpp mode change 100755 => 100644 demos/mobile/qcamera/messagehandling.h mode change 100755 => 100644 demos/mobile/qcamera/qcamera.pro mode change 100755 => 100644 demos/mobile/qcamera/resources.qrc mode change 100755 => 100644 demos/qtdemo/images/demobg.png mode change 100755 => 100644 doc/src/images/audiodevices-example.png mode change 100755 => 100644 doc/src/images/audiooutput-example.png mode change 100755 => 100644 doc/src/images/clock.png mode change 100755 => 100644 doc/src/images/dummy_tree.png mode change 100755 => 100644 doc/src/images/edit.png mode change 100755 => 100644 doc/src/images/example_model.png mode change 100755 => 100644 doc/src/images/lineedit.png mode change 100755 => 100644 doc/src/images/list_table_tree.png mode change 100755 => 100644 doc/src/images/listview.png mode change 100755 => 100644 doc/src/images/lotto.png mode change 100755 => 100644 doc/src/images/modelview-combobox.png mode change 100755 => 100644 doc/src/images/modelview-header.png mode change 100755 => 100644 doc/src/images/modelview.png mode change 100755 => 100644 doc/src/images/path.png mode change 100755 => 100644 doc/src/images/qcompleter.png mode change 100755 => 100644 doc/src/images/readonlytable.png mode change 100755 => 100644 doc/src/images/readonlytable_role.png mode change 100755 => 100644 doc/src/images/selection2.png mode change 100755 => 100644 doc/src/images/standardwidget.png mode change 100755 => 100644 doc/src/images/tableview.png mode change 100755 => 100644 doc/src/images/tree.png mode change 100755 => 100644 doc/src/images/tree_2.png mode change 100755 => 100644 doc/src/images/tree_2_with_algorithm.png mode change 100755 => 100644 doc/src/images/tree_city.png mode change 100755 => 100644 doc/src/images/treeview.png mode change 100755 => 100644 doc/src/images/treeview_sml.png mode change 100755 => 100644 doc/src/images/widgetmapper.png mode change 100755 => 100644 doc/src/template/images/bg_l.png mode change 100755 => 100644 doc/src/template/images/bg_l_blank.png mode change 100755 => 100644 doc/src/template/images/bg_r.png mode change 100755 => 100644 doc/src/template/images/box_bg.png mode change 100755 => 100644 doc/src/template/images/breadcrumb.png mode change 100755 => 100644 doc/src/template/images/bullet_gt.png mode change 100755 => 100644 doc/src/template/images/bullet_sq.png mode change 100755 => 100644 doc/src/template/images/feedbackground.png mode change 100755 => 100644 doc/src/template/images/horBar.png mode change 100755 => 100644 doc/src/template/images/page_bg.png mode change 100755 => 100644 doc/src/template/images/sprites-combined.png mode change 100755 => 100644 doc/src/template/scripts/functions.js mode change 100755 => 100644 doc/src/template/scripts/jquery.js mode change 100755 => 100644 doc/src/template/style/style.css mode change 100755 => 100644 doc/src/template/style/style_ie6.css mode change 100755 => 100644 doc/src/template/style/style_ie7.css mode change 100755 => 100644 doc/src/template/style/style_ie8.css mode change 100755 => 100644 examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/declarative/shadereffects/main.cpp mode change 100755 => 100644 examples/declarative/shadereffects/qml/Curtain.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/CurtainEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/DropShadow.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/DropShadowEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/Grayscale.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/GrayscaleEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/ImageMask.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/ImageMaskEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/RadialWave.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/RadialWaveEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/Water.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/WaterEffect.qml mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/Curtain.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/DropShadow.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/Grayscale.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/ImageMask.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/RadialWave.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/Water.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/back.png mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/bg.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/desaturate.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/drop_shadow.png mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/fabric.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/flower.png mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/image1.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/image2.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/qt-logo.png mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/shader_effects.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/sky.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/toolbar.png mode change 100755 => 100644 examples/declarative/shadereffects/qml/images/wave.jpg mode change 100755 => 100644 examples/declarative/shadereffects/qml/main.qml mode change 100755 => 100644 examples/declarative/shadereffects/shadereffects.pro mode change 100755 => 100644 examples/declarative/tutorials/samegame/samegame4/content/samegame.js mode change 100755 => 100644 examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml mode change 100755 => 100644 examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl mode change 100755 => 100644 examples/declarative/tutorials/samegame/samegame4/highscores/scores.php mode change 100755 => 100644 examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules mode change 100755 => 100644 examples/network/bearercloud/lan.svg mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/gsqt.pro mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part1/main.cpp mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part1/part1.pro mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part2/main.cpp mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part2/part2.pro mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part3/main.cpp mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part3/part3.pro mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part4/main.cpp mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part4/part4.pro mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part5/main.cpp mode change 100755 => 100644 examples/tutorials/gettingStarted/gsQt/part5/part5.pro mode change 100755 => 100644 examples/tutorials/modelview/1_readonly/1_readonly.pro mode change 100755 => 100644 examples/tutorials/modelview/1_readonly/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/1_readonly/mymodel.cpp mode change 100755 => 100644 examples/tutorials/modelview/1_readonly/mymodel.h mode change 100755 => 100644 examples/tutorials/modelview/2_formatting/2_formatting.pro mode change 100755 => 100644 examples/tutorials/modelview/2_formatting/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/2_formatting/mymodel.cpp mode change 100755 => 100644 examples/tutorials/modelview/2_formatting/mymodel.h mode change 100755 => 100644 examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro mode change 100755 => 100644 examples/tutorials/modelview/3_changingmodel/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/3_changingmodel/mymodel.cpp mode change 100755 => 100644 examples/tutorials/modelview/3_changingmodel/mymodel.h mode change 100755 => 100644 examples/tutorials/modelview/4_headers/4_headers.pro mode change 100755 => 100644 examples/tutorials/modelview/4_headers/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/4_headers/mymodel.cpp mode change 100755 => 100644 examples/tutorials/modelview/4_headers/mymodel.h mode change 100755 => 100644 examples/tutorials/modelview/5_edit/5_edit.pro mode change 100755 => 100644 examples/tutorials/modelview/5_edit/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/5_edit/mainwindow.cpp mode change 100755 => 100644 examples/tutorials/modelview/5_edit/mainwindow.h mode change 100755 => 100644 examples/tutorials/modelview/5_edit/mymodel.cpp mode change 100755 => 100644 examples/tutorials/modelview/5_edit/mymodel.h mode change 100755 => 100644 examples/tutorials/modelview/6_treeview/6_treeview.pro mode change 100755 => 100644 examples/tutorials/modelview/6_treeview/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/6_treeview/mainwindow.cpp mode change 100755 => 100644 examples/tutorials/modelview/6_treeview/mainwindow.h mode change 100755 => 100644 examples/tutorials/modelview/7_selections/7_selections.pro mode change 100755 => 100644 examples/tutorials/modelview/7_selections/main.cpp mode change 100755 => 100644 examples/tutorials/modelview/7_selections/mainwindow.cpp mode change 100755 => 100644 examples/tutorials/modelview/7_selections/mainwindow.h mode change 100755 => 100644 examples/tutorials/modelview/modelview.pro mode change 100755 => 100644 examples/tutorials/threads/clock/clock.pro mode change 100755 => 100644 examples/tutorials/threads/clock/main.cpp mode change 100755 => 100644 examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp mode change 100755 => 100644 examples/tutorials/threads/helloconcurrent/helloconcurrent.pro mode change 100755 => 100644 examples/tutorials/threads/hellothread/hellothread.cpp mode change 100755 => 100644 examples/tutorials/threads/hellothread/hellothread.h mode change 100755 => 100644 examples/tutorials/threads/hellothread/hellothread.pro mode change 100755 => 100644 examples/tutorials/threads/hellothread/main.cpp mode change 100755 => 100644 examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp mode change 100755 => 100644 examples/tutorials/threads/hellothreadpool/hellothreadpool.pro mode change 100755 => 100644 examples/tutorials/threads/movedobject/main.cpp mode change 100755 => 100644 examples/tutorials/threads/movedobject/movedobject.pro mode change 100755 => 100644 examples/webkit/formextractor/form.html mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_accord.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_demo-rotate.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_demo-scale.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_demo-skew.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_gallery.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_panel.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_pulse.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_skew.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_slide.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/anim_tabbedSkew.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_backgrounds.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_border-img.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_grad-radial.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_gradientBack.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_gradientBackStop.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_gradientButton.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_mask-grad.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_mask-img.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_multicol.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_reflect.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_scroll.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_sel-nth.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_shadow.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_shadowBlur.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_text-overflow.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_text-shadow.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/css3_text-stroke.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/form_tapper.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/form_toggler.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/layout_link-fmt.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/layout_tbl-keyhole.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mob_condjs.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mob_mediaquery.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mobile.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mq_desktop.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mq_mobile.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mq_touch.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mqlayout_desktop.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mqlayout_mobile.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/mqlayout_touch.css mode change 100755 => 100644 examples/webkit/webkit-guide/css/storage.css mode change 100755 => 100644 examples/webkit/webkit-guide/img/border-frame.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/gradient.jpg mode change 100755 => 100644 examples/webkit/webkit-guide/img/gray_icon_close.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ag_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ag_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ag_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ag_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_al_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_al_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_al_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_al_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ar_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ar_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ar_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ar_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_b_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_b_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_b_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_b_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_be_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_be_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_be_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_be_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_c_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_c_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_c_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_c_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ca_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ca_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ca_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ca_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cl_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cl_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cl_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cl_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cu_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cu_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cu_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_cu_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_f_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_f_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_f_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_f_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_fe_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_fe_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_fe_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_fe_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_h_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_h_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_h_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_h_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_he_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_he_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_he_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_he_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_k_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_k_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_k_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_k_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_li_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_li_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_li_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_li_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_mg_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_mg_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_mg_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_mg_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_n_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_n_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_n_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_n_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_na_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_na_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_na_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_na_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ne_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ne_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ne_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ne_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ni_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ni_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ni_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_ni_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_o_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_o_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_o_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_o_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_pt_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_pt_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_pt_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_pt_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_si_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_si_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_si_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_si_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_zn_016.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_zn_032.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_zn_036.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/ic_zn_048.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_check.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_check_x24green.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_dismiss.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_dismiss_x22.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_drill-down.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_drill-down_x32.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_drill-up.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_drill-up_x32.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_expand-nav.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_head-collapsed.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_head-expanded.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_head-expanded_x13.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_info.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_info_x24.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-doc.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-email.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-external.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-pdf.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-ppt.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-rss.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-sms.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-tel.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_link-xls.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_list-all.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_list-all_circ.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_nav-start.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_nav-top.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_nav-up.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_nav_end.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_question.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_scroll-left.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_scroll-right.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/icon_trash.png mode change 100755 => 100644 examples/webkit/webkit-guide/img/mask.png mode change 100755 => 100644 examples/webkit/webkit-guide/js/anim_accord.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/anim_gallery.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/anim_panel.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/anim_skew.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_backgrounds.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_border-img.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_grad-radial.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_mask-grad.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_mask-img.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/css3_text-overflow.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/form_tapper.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/mob_condjs.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/mobile.js mode change 100755 => 100644 examples/webkit/webkit-guide/js/storage.js mode change 100755 => 100644 mkspecs/macx-pbuilder/Info.plist.app mode change 100755 => 100644 mkspecs/macx-pbuilder/qmake.conf mode change 100755 => 100644 mkspecs/macx-xcode/Info.plist.app mode change 100755 => 100644 mkspecs/macx-xcode/qmake.conf mode change 100755 => 100644 src/imports/shaders/glfunctions.h mode change 100755 => 100644 src/imports/shaders/shadereffectitem.cpp mode change 100755 => 100644 src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj mode change 100755 => 100644 src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj mode change 100755 => 100644 src/s60installs/s60installs.pro mode change 100755 => 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png mode change 100755 => 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png mode change 100755 => 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png mode change 100755 => 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png mode change 100755 => 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png mode change 100755 => 100644 tests/auto/mediaobject/mediaobject.pro mode change 100755 => 100644 tests/auto/qimagereader/images/txts.png mode change 100755 => 100644 tests/auto/qlocalsocket/lackey/scripts/client.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma/Date/15.9.1.13-1.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma/ExecutionContexts/10.1.3-2.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma/README mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/README mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-003-n.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-004-n.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-005-n.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.4.11-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/15.4.5.1-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-02.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-03.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-322135-04.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.1.2-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.3.2-1.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.4.3.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Date/15.9.5.5-02.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/10.6.1-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/ExecutionContexts/regress-448595-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-02.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.10-03.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.1-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.2-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Expressions/11.7.3-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/LexicalConventions/7.9.1.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Number/regress-442242-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Object/8.6.1-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-385393-07.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.13.1-002.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/11.4.1-002.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/README mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/15.10.2.12.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-01-n.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-02.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-03.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375715-04.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-385393-04.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-441477-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/12.6.3.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-01.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/Unicode/regress-352044-02-n.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/10.1.3-2.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/7.9.1.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-385393-03.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js mode change 100755 => 100644 tests/auto/qscriptjstestsuite/tests/ecma_3/template.js mode change 100755 => 100644 tests/auto/qsqldatabase/testdata/qtest.mdb mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent mode change 100755 => 100644 tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent mode change 100755 => 100644 tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro mode change 100755 => 100644 tests/benchmarks/corelib/io/qiodevice/qiodevice.pro mode change 100755 => 100644 tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro mode change 100755 => 100644 tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml mode change 100755 => 100644 tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml mode change 100755 => 100644 tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png mode change 100755 => 100644 tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png mode change 100755 => 100644 tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg mode change 100755 => 100644 tools/qdoc3/doc/config/images/bg_l.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/bg_l_blank.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/bg_r.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/box_bg.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/breadcrumb.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/bullet_gt.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/bullet_sq.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/feedbackground.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/horBar.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/page_bg.png mode change 100755 => 100644 tools/qdoc3/doc/config/images/sprites-combined.png mode change 100755 => 100644 tools/qdoc3/doc/config/scripts/functions.js mode change 100755 => 100644 tools/qdoc3/doc/config/scripts/jquery.js diff --git a/.hgignore b/.hgignore old mode 100755 new mode 100644 diff --git a/config.profiles/harmattan/rules b/config.profiles/harmattan/rules old mode 100755 new mode 100644 diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml old mode 100755 new mode 100644 diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test old mode 100755 new mode 100644 diff --git a/config.tests/mac/defaultarch.test b/config.tests/mac/defaultarch.test old mode 100755 new mode 100644 diff --git a/config.tests/mac/dwarf2.test b/config.tests/mac/dwarf2.test old mode 100755 new mode 100644 diff --git a/config.tests/mac/xarch.test b/config.tests/mac/xarch.test old mode 100755 new mode 100644 diff --git a/config.tests/symbian/compile.test b/config.tests/symbian/compile.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs old mode 100755 new mode 100644 diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/padstring b/config.tests/unix/padstring old mode 100755 new mode 100644 diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test old mode 100755 new mode 100644 diff --git a/config.tests/unix/which.test b/config.tests/unix/which.test old mode 100755 new mode 100644 diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test old mode 100755 new mode 100644 diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js old mode 100755 new mode 100644 diff --git a/demos/declarative/samegame/highscores/score_data.xml b/demos/declarative/samegame/highscores/score_data.xml old mode 100755 new mode 100644 diff --git a/demos/declarative/samegame/highscores/score_style.xsl b/demos/declarative/samegame/highscores/score_style.xsl old mode 100755 new mode 100644 diff --git a/demos/declarative/samegame/highscores/scores.php b/demos/declarative/samegame/highscores/scores.php old mode 100755 new mode 100644 diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png old mode 100755 new mode 100644 diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/businesscardhandling.cpp b/demos/mobile/qcamera/businesscardhandling.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/businesscardhandling.h b/demos/mobile/qcamera/businesscardhandling.h old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/button.cpp b/demos/mobile/qcamera/button.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/button.h b/demos/mobile/qcamera/button.h old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/cameraexample.cpp b/demos/mobile/qcamera/cameraexample.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/cameraexample.h b/demos/mobile/qcamera/cameraexample.h old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/contactsdlg.cpp b/demos/mobile/qcamera/contactsdlg.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/contactsdlg.h b/demos/mobile/qcamera/contactsdlg.h old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/icons/camera.png b/demos/mobile/qcamera/icons/camera.png old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/icons/cameramms_icon.svg b/demos/mobile/qcamera/icons/cameramms_icon.svg old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/icons/exit.png b/demos/mobile/qcamera/icons/exit.png old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/icons/mms.png b/demos/mobile/qcamera/icons/mms.png old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/main.cpp b/demos/mobile/qcamera/main.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/messagehandling.cpp b/demos/mobile/qcamera/messagehandling.cpp old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/messagehandling.h b/demos/mobile/qcamera/messagehandling.h old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/qcamera.pro b/demos/mobile/qcamera/qcamera.pro old mode 100755 new mode 100644 diff --git a/demos/mobile/qcamera/resources.qrc b/demos/mobile/qcamera/resources.qrc old mode 100755 new mode 100644 diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png old mode 100755 new mode 100644 diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png old mode 100755 new mode 100644 diff --git a/doc/src/images/audiooutput-example.png b/doc/src/images/audiooutput-example.png old mode 100755 new mode 100644 diff --git a/doc/src/images/clock.png b/doc/src/images/clock.png old mode 100755 new mode 100644 diff --git a/doc/src/images/dummy_tree.png b/doc/src/images/dummy_tree.png old mode 100755 new mode 100644 diff --git a/doc/src/images/edit.png b/doc/src/images/edit.png old mode 100755 new mode 100644 diff --git a/doc/src/images/example_model.png b/doc/src/images/example_model.png old mode 100755 new mode 100644 diff --git a/doc/src/images/lineedit.png b/doc/src/images/lineedit.png old mode 100755 new mode 100644 diff --git a/doc/src/images/list_table_tree.png b/doc/src/images/list_table_tree.png old mode 100755 new mode 100644 diff --git a/doc/src/images/listview.png b/doc/src/images/listview.png old mode 100755 new mode 100644 diff --git a/doc/src/images/lotto.png b/doc/src/images/lotto.png old mode 100755 new mode 100644 diff --git a/doc/src/images/modelview-combobox.png b/doc/src/images/modelview-combobox.png old mode 100755 new mode 100644 diff --git a/doc/src/images/modelview-header.png b/doc/src/images/modelview-header.png old mode 100755 new mode 100644 diff --git a/doc/src/images/modelview.png b/doc/src/images/modelview.png old mode 100755 new mode 100644 diff --git a/doc/src/images/path.png b/doc/src/images/path.png old mode 100755 new mode 100644 diff --git a/doc/src/images/qcompleter.png b/doc/src/images/qcompleter.png old mode 100755 new mode 100644 diff --git a/doc/src/images/readonlytable.png b/doc/src/images/readonlytable.png old mode 100755 new mode 100644 diff --git a/doc/src/images/readonlytable_role.png b/doc/src/images/readonlytable_role.png old mode 100755 new mode 100644 diff --git a/doc/src/images/selection2.png b/doc/src/images/selection2.png old mode 100755 new mode 100644 diff --git a/doc/src/images/standardwidget.png b/doc/src/images/standardwidget.png old mode 100755 new mode 100644 diff --git a/doc/src/images/tableview.png b/doc/src/images/tableview.png old mode 100755 new mode 100644 diff --git a/doc/src/images/tree.png b/doc/src/images/tree.png old mode 100755 new mode 100644 diff --git a/doc/src/images/tree_2.png b/doc/src/images/tree_2.png old mode 100755 new mode 100644 diff --git a/doc/src/images/tree_2_with_algorithm.png b/doc/src/images/tree_2_with_algorithm.png old mode 100755 new mode 100644 diff --git a/doc/src/images/tree_city.png b/doc/src/images/tree_city.png old mode 100755 new mode 100644 diff --git a/doc/src/images/treeview.png b/doc/src/images/treeview.png old mode 100755 new mode 100644 diff --git a/doc/src/images/treeview_sml.png b/doc/src/images/treeview_sml.png old mode 100755 new mode 100644 diff --git a/doc/src/images/widgetmapper.png b/doc/src/images/widgetmapper.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/bg_l.png b/doc/src/template/images/bg_l.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/bg_l_blank.png b/doc/src/template/images/bg_l_blank.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/bg_r.png b/doc/src/template/images/bg_r.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/box_bg.png b/doc/src/template/images/box_bg.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/breadcrumb.png b/doc/src/template/images/breadcrumb.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/bullet_gt.png b/doc/src/template/images/bullet_gt.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/bullet_sq.png b/doc/src/template/images/bullet_sq.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/feedbackground.png b/doc/src/template/images/feedbackground.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/horBar.png b/doc/src/template/images/horBar.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/page_bg.png b/doc/src/template/images/page_bg.png old mode 100755 new mode 100644 diff --git a/doc/src/template/images/sprites-combined.png b/doc/src/template/images/sprites-combined.png old mode 100755 new mode 100644 diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js old mode 100755 new mode 100644 diff --git a/doc/src/template/scripts/jquery.js b/doc/src/template/scripts/jquery.js old mode 100755 new mode 100644 diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css old mode 100755 new mode 100644 diff --git a/doc/src/template/style/style_ie6.css b/doc/src/template/style/style_ie6.css old mode 100755 new mode 100644 diff --git a/doc/src/template/style/style_ie7.css b/doc/src/template/style/style_ie7.css old mode 100755 new mode 100644 diff --git a/doc/src/template/style/style_ie8.css b/doc/src/template/style/style_ie8.css old mode 100755 new mode 100644 diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/main.cpp b/examples/declarative/shadereffects/main.cpp old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/Curtain.qml b/examples/declarative/shadereffects/qml/Curtain.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/CurtainEffect.qml b/examples/declarative/shadereffects/qml/CurtainEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/DropShadow.qml b/examples/declarative/shadereffects/qml/DropShadow.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/DropShadowEffect.qml b/examples/declarative/shadereffects/qml/DropShadowEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/Grayscale.qml b/examples/declarative/shadereffects/qml/Grayscale.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/GrayscaleEffect.qml b/examples/declarative/shadereffects/qml/GrayscaleEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/ImageMask.qml b/examples/declarative/shadereffects/qml/ImageMask.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/ImageMaskEffect.qml b/examples/declarative/shadereffects/qml/ImageMaskEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/RadialWave.qml b/examples/declarative/shadereffects/qml/RadialWave.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/RadialWaveEffect.qml b/examples/declarative/shadereffects/qml/RadialWaveEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/Water.qml b/examples/declarative/shadereffects/qml/Water.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/WaterEffect.qml b/examples/declarative/shadereffects/qml/WaterEffect.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/Curtain.jpg b/examples/declarative/shadereffects/qml/images/Curtain.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/DropShadow.jpg b/examples/declarative/shadereffects/qml/images/DropShadow.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/Grayscale.jpg b/examples/declarative/shadereffects/qml/images/Grayscale.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/ImageMask.jpg b/examples/declarative/shadereffects/qml/images/ImageMask.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/RadialWave.jpg b/examples/declarative/shadereffects/qml/images/RadialWave.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/Water.jpg b/examples/declarative/shadereffects/qml/images/Water.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/back.png b/examples/declarative/shadereffects/qml/images/back.png old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/bg.jpg b/examples/declarative/shadereffects/qml/images/bg.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/desaturate.jpg b/examples/declarative/shadereffects/qml/images/desaturate.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/drop_shadow.png b/examples/declarative/shadereffects/qml/images/drop_shadow.png old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/fabric.jpg b/examples/declarative/shadereffects/qml/images/fabric.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/flower.png b/examples/declarative/shadereffects/qml/images/flower.png old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/image1.jpg b/examples/declarative/shadereffects/qml/images/image1.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/image2.jpg b/examples/declarative/shadereffects/qml/images/image2.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/qt-logo.png b/examples/declarative/shadereffects/qml/images/qt-logo.png old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/shader_effects.jpg b/examples/declarative/shadereffects/qml/images/shader_effects.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/sky.jpg b/examples/declarative/shadereffects/qml/images/sky.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/toolbar.png b/examples/declarative/shadereffects/qml/images/toolbar.png old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/images/wave.jpg b/examples/declarative/shadereffects/qml/images/wave.jpg old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/qml/main.qml b/examples/declarative/shadereffects/qml/main.qml old mode 100755 new mode 100644 diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro old mode 100755 new mode 100644 diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js old mode 100755 new mode 100644 diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml old mode 100755 new mode 100644 diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl old mode 100755 new mode 100644 diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php old mode 100755 new mode 100644 diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules old mode 100755 new mode 100644 diff --git a/examples/network/bearercloud/lan.svg b/examples/network/bearercloud/lan.svg old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/tutorials/gettingStarted/gsQt/gsqt.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part3/main.cpp b/examples/tutorials/gettingStarted/gsQt/part3/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/tutorials/gettingStarted/gsQt/part3/part3.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part4/main.cpp b/examples/tutorials/gettingStarted/gsQt/part4/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/tutorials/gettingStarted/gsQt/part4/part4.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part5/main.cpp b/examples/tutorials/gettingStarted/gsQt/part5/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/tutorials/gettingStarted/gsQt/part5/part5.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/1_readonly/1_readonly.pro b/examples/tutorials/modelview/1_readonly/1_readonly.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/1_readonly/main.cpp b/examples/tutorials/modelview/1_readonly/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/1_readonly/mymodel.cpp b/examples/tutorials/modelview/1_readonly/mymodel.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/1_readonly/mymodel.h b/examples/tutorials/modelview/1_readonly/mymodel.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/2_formatting/2_formatting.pro b/examples/tutorials/modelview/2_formatting/2_formatting.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/2_formatting/main.cpp b/examples/tutorials/modelview/2_formatting/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/2_formatting/mymodel.cpp b/examples/tutorials/modelview/2_formatting/mymodel.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/2_formatting/mymodel.h b/examples/tutorials/modelview/2_formatting/mymodel.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/3_changingmodel/main.cpp b/examples/tutorials/modelview/3_changingmodel/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/4_headers/4_headers.pro b/examples/tutorials/modelview/4_headers/4_headers.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/4_headers/main.cpp b/examples/tutorials/modelview/4_headers/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/4_headers/mymodel.cpp b/examples/tutorials/modelview/4_headers/mymodel.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/4_headers/mymodel.h b/examples/tutorials/modelview/4_headers/mymodel.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/5_edit.pro b/examples/tutorials/modelview/5_edit/5_edit.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/main.cpp b/examples/tutorials/modelview/5_edit/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/mainwindow.cpp b/examples/tutorials/modelview/5_edit/mainwindow.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/mymodel.cpp b/examples/tutorials/modelview/5_edit/mymodel.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/5_edit/mymodel.h b/examples/tutorials/modelview/5_edit/mymodel.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/6_treeview/6_treeview.pro b/examples/tutorials/modelview/6_treeview/6_treeview.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/6_treeview/main.cpp b/examples/tutorials/modelview/6_treeview/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.cpp b/examples/tutorials/modelview/6_treeview/mainwindow.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/7_selections/7_selections.pro b/examples/tutorials/modelview/7_selections/7_selections.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/7_selections/main.cpp b/examples/tutorials/modelview/7_selections/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/7_selections/mainwindow.cpp b/examples/tutorials/modelview/7_selections/mainwindow.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/modelview/modelview.pro b/examples/tutorials/modelview/modelview.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/clock/clock.pro b/examples/tutorials/threads/clock/clock.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/clock/main.cpp b/examples/tutorials/threads/clock/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp b/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothread/hellothread.cpp b/examples/tutorials/threads/hellothread/hellothread.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothread/hellothread.h b/examples/tutorials/threads/hellothread/hellothread.h old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothread/hellothread.pro b/examples/tutorials/threads/hellothread/hellothread.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothread/main.cpp b/examples/tutorials/threads/hellothread/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp b/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/movedobject/main.cpp b/examples/tutorials/threads/movedobject/main.cpp old mode 100755 new mode 100644 diff --git a/examples/tutorials/threads/movedobject/movedobject.pro b/examples/tutorials/threads/movedobject/movedobject.pro old mode 100755 new mode 100644 diff --git a/examples/webkit/formextractor/form.html b/examples/webkit/formextractor/form.html old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_accord.css b/examples/webkit/webkit-guide/css/anim_accord.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_demo-rotate.css b/examples/webkit/webkit-guide/css/anim_demo-rotate.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_demo-scale.css b/examples/webkit/webkit-guide/css/anim_demo-scale.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_demo-skew.css b/examples/webkit/webkit-guide/css/anim_demo-skew.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_gallery.css b/examples/webkit/webkit-guide/css/anim_gallery.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_panel.css b/examples/webkit/webkit-guide/css/anim_panel.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_pulse.css b/examples/webkit/webkit-guide/css/anim_pulse.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_skew.css b/examples/webkit/webkit-guide/css/anim_skew.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_slide.css b/examples/webkit/webkit-guide/css/anim_slide.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/anim_tabbedSkew.css b/examples/webkit/webkit-guide/css/anim_tabbedSkew.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_backgrounds.css b/examples/webkit/webkit-guide/css/css3_backgrounds.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_border-img.css b/examples/webkit/webkit-guide/css/css3_border-img.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_grad-radial.css b/examples/webkit/webkit-guide/css/css3_grad-radial.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_gradientBack.css b/examples/webkit/webkit-guide/css/css3_gradientBack.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_gradientBackStop.css b/examples/webkit/webkit-guide/css/css3_gradientBackStop.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_gradientButton.css b/examples/webkit/webkit-guide/css/css3_gradientButton.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_mask-grad.css b/examples/webkit/webkit-guide/css/css3_mask-grad.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_mask-img.css b/examples/webkit/webkit-guide/css/css3_mask-img.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_multicol.css b/examples/webkit/webkit-guide/css/css3_multicol.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_reflect.css b/examples/webkit/webkit-guide/css/css3_reflect.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_scroll.css b/examples/webkit/webkit-guide/css/css3_scroll.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_sel-nth.css b/examples/webkit/webkit-guide/css/css3_sel-nth.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_shadow.css b/examples/webkit/webkit-guide/css/css3_shadow.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_shadowBlur.css b/examples/webkit/webkit-guide/css/css3_shadowBlur.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_text-overflow.css b/examples/webkit/webkit-guide/css/css3_text-overflow.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_text-shadow.css b/examples/webkit/webkit-guide/css/css3_text-shadow.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/css3_text-stroke.css b/examples/webkit/webkit-guide/css/css3_text-stroke.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/form_tapper.css b/examples/webkit/webkit-guide/css/form_tapper.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/form_toggler.css b/examples/webkit/webkit-guide/css/form_toggler.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/layout_link-fmt.css b/examples/webkit/webkit-guide/css/layout_link-fmt.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css b/examples/webkit/webkit-guide/css/layout_tbl-keyhole.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mob_condjs.css b/examples/webkit/webkit-guide/css/mob_condjs.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mob_mediaquery.css b/examples/webkit/webkit-guide/css/mob_mediaquery.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mobile.css b/examples/webkit/webkit-guide/css/mobile.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mq_desktop.css b/examples/webkit/webkit-guide/css/mq_desktop.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mq_mobile.css b/examples/webkit/webkit-guide/css/mq_mobile.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mq_touch.css b/examples/webkit/webkit-guide/css/mq_touch.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mqlayout_desktop.css b/examples/webkit/webkit-guide/css/mqlayout_desktop.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mqlayout_mobile.css b/examples/webkit/webkit-guide/css/mqlayout_mobile.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/mqlayout_touch.css b/examples/webkit/webkit-guide/css/mqlayout_touch.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/css/storage.css b/examples/webkit/webkit-guide/css/storage.css old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/border-frame.png b/examples/webkit/webkit-guide/img/border-frame.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/gradient.jpg b/examples/webkit/webkit-guide/img/gradient.jpg old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/gray_icon_close.png b/examples/webkit/webkit-guide/img/gray_icon_close.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ag_016.png b/examples/webkit/webkit-guide/img/ic_ag_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ag_032.png b/examples/webkit/webkit-guide/img/ic_ag_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ag_036.png b/examples/webkit/webkit-guide/img/ic_ag_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ag_048.png b/examples/webkit/webkit-guide/img/ic_ag_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_al_016.png b/examples/webkit/webkit-guide/img/ic_al_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_al_032.png b/examples/webkit/webkit-guide/img/ic_al_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_al_036.png b/examples/webkit/webkit-guide/img/ic_al_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_al_048.png b/examples/webkit/webkit-guide/img/ic_al_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ar_016.png b/examples/webkit/webkit-guide/img/ic_ar_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ar_032.png b/examples/webkit/webkit-guide/img/ic_ar_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ar_036.png b/examples/webkit/webkit-guide/img/ic_ar_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ar_048.png b/examples/webkit/webkit-guide/img/ic_ar_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_b_016.png b/examples/webkit/webkit-guide/img/ic_b_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_b_032.png b/examples/webkit/webkit-guide/img/ic_b_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_b_036.png b/examples/webkit/webkit-guide/img/ic_b_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_b_048.png b/examples/webkit/webkit-guide/img/ic_b_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_be_016.png b/examples/webkit/webkit-guide/img/ic_be_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_be_032.png b/examples/webkit/webkit-guide/img/ic_be_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_be_036.png b/examples/webkit/webkit-guide/img/ic_be_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_be_048.png b/examples/webkit/webkit-guide/img/ic_be_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_c_016.png b/examples/webkit/webkit-guide/img/ic_c_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_c_032.png b/examples/webkit/webkit-guide/img/ic_c_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_c_036.png b/examples/webkit/webkit-guide/img/ic_c_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_c_048.png b/examples/webkit/webkit-guide/img/ic_c_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ca_016.png b/examples/webkit/webkit-guide/img/ic_ca_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ca_032.png b/examples/webkit/webkit-guide/img/ic_ca_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ca_036.png b/examples/webkit/webkit-guide/img/ic_ca_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ca_048.png b/examples/webkit/webkit-guide/img/ic_ca_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cl_016.png b/examples/webkit/webkit-guide/img/ic_cl_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cl_032.png b/examples/webkit/webkit-guide/img/ic_cl_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cl_036.png b/examples/webkit/webkit-guide/img/ic_cl_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cl_048.png b/examples/webkit/webkit-guide/img/ic_cl_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cu_016.png b/examples/webkit/webkit-guide/img/ic_cu_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cu_032.png b/examples/webkit/webkit-guide/img/ic_cu_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cu_036.png b/examples/webkit/webkit-guide/img/ic_cu_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_cu_048.png b/examples/webkit/webkit-guide/img/ic_cu_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_f_016.png b/examples/webkit/webkit-guide/img/ic_f_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_f_032.png b/examples/webkit/webkit-guide/img/ic_f_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_f_036.png b/examples/webkit/webkit-guide/img/ic_f_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_f_048.png b/examples/webkit/webkit-guide/img/ic_f_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_fe_016.png b/examples/webkit/webkit-guide/img/ic_fe_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_fe_032.png b/examples/webkit/webkit-guide/img/ic_fe_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_fe_036.png b/examples/webkit/webkit-guide/img/ic_fe_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_fe_048.png b/examples/webkit/webkit-guide/img/ic_fe_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_h_016.png b/examples/webkit/webkit-guide/img/ic_h_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_h_032.png b/examples/webkit/webkit-guide/img/ic_h_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_h_036.png b/examples/webkit/webkit-guide/img/ic_h_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_h_048.png b/examples/webkit/webkit-guide/img/ic_h_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_he_016.png b/examples/webkit/webkit-guide/img/ic_he_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_he_032.png b/examples/webkit/webkit-guide/img/ic_he_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_he_036.png b/examples/webkit/webkit-guide/img/ic_he_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_he_048.png b/examples/webkit/webkit-guide/img/ic_he_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_k_016.png b/examples/webkit/webkit-guide/img/ic_k_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_k_032.png b/examples/webkit/webkit-guide/img/ic_k_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_k_036.png b/examples/webkit/webkit-guide/img/ic_k_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_k_048.png b/examples/webkit/webkit-guide/img/ic_k_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_li_016.png b/examples/webkit/webkit-guide/img/ic_li_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_li_032.png b/examples/webkit/webkit-guide/img/ic_li_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_li_036.png b/examples/webkit/webkit-guide/img/ic_li_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_li_048.png b/examples/webkit/webkit-guide/img/ic_li_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_mg_016.png b/examples/webkit/webkit-guide/img/ic_mg_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_mg_032.png b/examples/webkit/webkit-guide/img/ic_mg_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_mg_036.png b/examples/webkit/webkit-guide/img/ic_mg_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_mg_048.png b/examples/webkit/webkit-guide/img/ic_mg_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_n_016.png b/examples/webkit/webkit-guide/img/ic_n_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_n_032.png b/examples/webkit/webkit-guide/img/ic_n_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_n_036.png b/examples/webkit/webkit-guide/img/ic_n_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_n_048.png b/examples/webkit/webkit-guide/img/ic_n_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_na_016.png b/examples/webkit/webkit-guide/img/ic_na_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_na_032.png b/examples/webkit/webkit-guide/img/ic_na_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_na_036.png b/examples/webkit/webkit-guide/img/ic_na_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_na_048.png b/examples/webkit/webkit-guide/img/ic_na_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ne_016.png b/examples/webkit/webkit-guide/img/ic_ne_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ne_032.png b/examples/webkit/webkit-guide/img/ic_ne_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ne_036.png b/examples/webkit/webkit-guide/img/ic_ne_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ne_048.png b/examples/webkit/webkit-guide/img/ic_ne_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ni_016.png b/examples/webkit/webkit-guide/img/ic_ni_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ni_032.png b/examples/webkit/webkit-guide/img/ic_ni_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ni_036.png b/examples/webkit/webkit-guide/img/ic_ni_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_ni_048.png b/examples/webkit/webkit-guide/img/ic_ni_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_o_016.png b/examples/webkit/webkit-guide/img/ic_o_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_o_032.png b/examples/webkit/webkit-guide/img/ic_o_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_o_036.png b/examples/webkit/webkit-guide/img/ic_o_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_o_048.png b/examples/webkit/webkit-guide/img/ic_o_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_pt_016.png b/examples/webkit/webkit-guide/img/ic_pt_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_pt_032.png b/examples/webkit/webkit-guide/img/ic_pt_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_pt_036.png b/examples/webkit/webkit-guide/img/ic_pt_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_pt_048.png b/examples/webkit/webkit-guide/img/ic_pt_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_si_016.png b/examples/webkit/webkit-guide/img/ic_si_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_si_032.png b/examples/webkit/webkit-guide/img/ic_si_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_si_036.png b/examples/webkit/webkit-guide/img/ic_si_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_si_048.png b/examples/webkit/webkit-guide/img/ic_si_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_zn_016.png b/examples/webkit/webkit-guide/img/ic_zn_016.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_zn_032.png b/examples/webkit/webkit-guide/img/ic_zn_032.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_zn_036.png b/examples/webkit/webkit-guide/img/ic_zn_036.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/ic_zn_048.png b/examples/webkit/webkit-guide/img/ic_zn_048.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_check.png b/examples/webkit/webkit-guide/img/icon_check.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_check_x24green.png b/examples/webkit/webkit-guide/img/icon_check_x24green.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_dismiss.png b/examples/webkit/webkit-guide/img/icon_dismiss.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_dismiss_x22.png b/examples/webkit/webkit-guide/img/icon_dismiss_x22.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_drill-down.png b/examples/webkit/webkit-guide/img/icon_drill-down.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_drill-down_x32.png b/examples/webkit/webkit-guide/img/icon_drill-down_x32.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_drill-up.png b/examples/webkit/webkit-guide/img/icon_drill-up.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_drill-up_x32.png b/examples/webkit/webkit-guide/img/icon_drill-up_x32.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_expand-nav.png b/examples/webkit/webkit-guide/img/icon_expand-nav.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_head-collapsed.png b/examples/webkit/webkit-guide/img/icon_head-collapsed.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png b/examples/webkit/webkit-guide/img/icon_head-collapsed_x13.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_head-expanded.png b/examples/webkit/webkit-guide/img/icon_head-expanded.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png b/examples/webkit/webkit-guide/img/icon_head-expanded_x13.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_info.png b/examples/webkit/webkit-guide/img/icon_info.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_info_x24.png b/examples/webkit/webkit-guide/img/icon_info_x24.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-doc.png b/examples/webkit/webkit-guide/img/icon_link-doc.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-email.png b/examples/webkit/webkit-guide/img/icon_link-email.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-external.png b/examples/webkit/webkit-guide/img/icon_link-external.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-pdf.png b/examples/webkit/webkit-guide/img/icon_link-pdf.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-ppt.png b/examples/webkit/webkit-guide/img/icon_link-ppt.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-rss.png b/examples/webkit/webkit-guide/img/icon_link-rss.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-sms.png b/examples/webkit/webkit-guide/img/icon_link-sms.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-tel.png b/examples/webkit/webkit-guide/img/icon_link-tel.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_link-xls.png b/examples/webkit/webkit-guide/img/icon_link-xls.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_list-all.png b/examples/webkit/webkit-guide/img/icon_list-all.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_list-all_circ.png b/examples/webkit/webkit-guide/img/icon_list-all_circ.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_nav-start.png b/examples/webkit/webkit-guide/img/icon_nav-start.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_nav-top.png b/examples/webkit/webkit-guide/img/icon_nav-top.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_nav-up.png b/examples/webkit/webkit-guide/img/icon_nav-up.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_nav_end.png b/examples/webkit/webkit-guide/img/icon_nav_end.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_question.png b/examples/webkit/webkit-guide/img/icon_question.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_scroll-left.png b/examples/webkit/webkit-guide/img/icon_scroll-left.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_scroll-right.png b/examples/webkit/webkit-guide/img/icon_scroll-right.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/icon_trash.png b/examples/webkit/webkit-guide/img/icon_trash.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/img/mask.png b/examples/webkit/webkit-guide/img/mask.png old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/anim_accord.js b/examples/webkit/webkit-guide/js/anim_accord.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/anim_gallery.js b/examples/webkit/webkit-guide/js/anim_gallery.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/anim_panel.js b/examples/webkit/webkit-guide/js/anim_panel.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/anim_skew.js b/examples/webkit/webkit-guide/js/anim_skew.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_backgrounds.js b/examples/webkit/webkit-guide/js/css3_backgrounds.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_border-img.js b/examples/webkit/webkit-guide/js/css3_border-img.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_grad-radial.js b/examples/webkit/webkit-guide/js/css3_grad-radial.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_mask-grad.js b/examples/webkit/webkit-guide/js/css3_mask-grad.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_mask-img.js b/examples/webkit/webkit-guide/js/css3_mask-img.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/css3_text-overflow.js b/examples/webkit/webkit-guide/js/css3_text-overflow.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/form_tapper.js b/examples/webkit/webkit-guide/js/form_tapper.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/mob_condjs.js b/examples/webkit/webkit-guide/js/mob_condjs.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/mobile.js b/examples/webkit/webkit-guide/js/mobile.js old mode 100755 new mode 100644 diff --git a/examples/webkit/webkit-guide/js/storage.js b/examples/webkit/webkit-guide/js/storage.js old mode 100755 new mode 100644 diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app old mode 100755 new mode 100644 diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf old mode 100755 new mode 100644 diff --git a/mkspecs/macx-xcode/Info.plist.app b/mkspecs/macx-xcode/Info.plist.app old mode 100755 new mode 100644 diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf old mode 100755 new mode 100644 diff --git a/src/imports/shaders/glfunctions.h b/src/imports/shaders/glfunctions.h old mode 100755 new mode 100644 diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp old mode 100755 new mode 100644 diff --git a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj old mode 100755 new mode 100644 diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj old mode 100755 new mode 100644 diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro old mode 100755 new mode 100644 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png old mode 100755 new mode 100644 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png old mode 100755 new mode 100644 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png old mode 100755 new mode 100644 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png old mode 100755 new mode 100644 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png old mode 100755 new mode 100644 diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro old mode 100755 new mode 100644 diff --git a/tests/auto/qimagereader/images/txts.png b/tests/auto/qimagereader/images/txts.png old mode 100755 new mode 100644 diff --git a/tests/auto/qlocalsocket/lackey/scripts/client.js b/tests/auto/qlocalsocket/lackey/scripts/client.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/README b/tests/auto/qscriptjstestsuite/tests/ecma/README old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/README b/tests/auto/qscriptjstestsuite/tests/ecma_2/README old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/constructor-001.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/function-001.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-001.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-002.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js b/tests/auto/qscriptjstestsuite/tests/ecma_2/extensions/instanceof-006.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-387501.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-421325.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Array/regress-430717.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/arguments-002.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Function/regress-313570.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Object/regress-361274.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Operators/order-01.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/README b/tests/auto/qscriptjstestsuite/tests/ecma_3/README old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-285219.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-289669.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-307456.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-309840.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-311414.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-312351.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-330684.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-334158.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-346090.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-367888.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375642.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/RegExp/regress-375711.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-419152.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420087.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Regress/regress-420610.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-302439.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/Statements/regress-324650.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-304376.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-313567.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/String/regress-392378.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/browser.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-274152.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-320854.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-327170.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-368516.js old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-429248.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/extensions/regress-430740.js old mode 100755 new mode 100644 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js b/tests/auto/qscriptjstestsuite/tests/ecma_3/template.js old mode 100755 new mode 100644 diff --git a/tests/auto/qsqldatabase/testdata/qtest.mdb b/tests/auto/qsqldatabase/testdata/qtest.mdb old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent old mode 100755 new mode 100644 diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent old mode 100755 new mode 100644 diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro old mode 100755 new mode 100644 diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro old mode 100755 new mode 100644 diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro old mode 100755 new mode 100644 diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml old mode 100755 new mode 100644 diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml old mode 100755 new mode 100644 diff --git a/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png b/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png old mode 100755 new mode 100644 diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png old mode 100755 new mode 100644 diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/bg_l.png b/tools/qdoc3/doc/config/images/bg_l.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/bg_l_blank.png b/tools/qdoc3/doc/config/images/bg_l_blank.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/bg_r.png b/tools/qdoc3/doc/config/images/bg_r.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/box_bg.png b/tools/qdoc3/doc/config/images/box_bg.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/breadcrumb.png b/tools/qdoc3/doc/config/images/breadcrumb.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/bullet_gt.png b/tools/qdoc3/doc/config/images/bullet_gt.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/bullet_sq.png b/tools/qdoc3/doc/config/images/bullet_sq.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/feedbackground.png b/tools/qdoc3/doc/config/images/feedbackground.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/horBar.png b/tools/qdoc3/doc/config/images/horBar.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/page_bg.png b/tools/qdoc3/doc/config/images/page_bg.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/images/sprites-combined.png b/tools/qdoc3/doc/config/images/sprites-combined.png old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js old mode 100755 new mode 100644 diff --git a/tools/qdoc3/doc/config/scripts/jquery.js b/tools/qdoc3/doc/config/scripts/jquery.js old mode 100755 new mode 100644 -- cgit v0.12 From e64f927cc1f34763f6b61ac05a80e9277200fe3c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 22 Nov 2011 17:14:30 +0100 Subject: Fix more permissions (no execute bit). --- src/3rdparty/webkit/Source/WebCore/ChangeLog | 0 .../Source/WebCore/bindings/js/PageScriptDebugServer.cpp | 0 .../Source/WebCore/bindings/js/PageScriptDebugServer.h | 0 .../Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp | 0 .../Source/WebCore/bindings/js/WorkerScriptDebugServer.h | 0 src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp | 0 src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h | 0 .../webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp | 0 .../webkit/Source/WebCore/inspector/PageDebuggerAgent.h | 0 .../webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp | 0 .../webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h | 0 .../WebCore/inspector/front-end/CSSKeywordCompletions.js | 0 .../Source/WebCore/inspector/front-end/CookieParser.js | 0 .../WebCore/inspector/front-end/ExtensionAPISchema.json | 0 .../Source/WebCore/inspector/front-end/SearchController.js | 0 .../webkit/Source/WebCore/inspector/front-end/Toolbar.js | 0 .../webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp | 0 .../webkit/Source/WebCore/svg/SVGDocumentExtensions.h | 0 src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp | 0 src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h | 0 .../webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h | 0 .../webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png | Bin .../webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png | Bin .../webkit/Source/WebKit2/win/fsVideoExitFullscreen.png | Bin src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png | Bin src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png | Bin 26 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/ChangeLog mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp mode change 100755 => 100644 src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png mode change 100755 => 100644 src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/PageScriptDebugServer.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/WorkerScriptDebugServer.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/DataView.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/PageDebuggerAgent.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h b/src/3rdparty/webkit/Source/WebCore/inspector/WorkerDebuggerAgent.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/CookieParser.js old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/ExtensionAPISchema.json old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/SearchController.js old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js b/src/3rdparty/webkit/Source/WebCore/inspector/front-end/Toolbar.js old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h b/src/3rdparty/webkit/Source/WebKit2/UIProcess/win/WebUndoClient.h old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeHigh.png old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoAudioVolumeLow.png old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoExitFullscreen.png old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPause.png old mode 100755 new mode 100644 diff --git a/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png b/src/3rdparty/webkit/Source/WebKit2/win/fsVideoPlay.png old mode 100755 new mode 100644 -- cgit v0.12 From b233fb15f66b7c9e7bff782aa05e543eb45e52e7 Mon Sep 17 00:00:00 2001 From: Satyam Bandarapu Date: Fri, 25 Nov 2011 00:25:38 +0200 Subject: New API to set AVKON flag to inputcontext in Qt/Symbian. This API is to pass any AVKON FEP flag to QCoeFepInputContext. Implemented as an exported private API, which is available only in Qt/Symbian. If latin keyboard flag is passed to this API and editor is Email/Url, virtual keyboard launches always with latin characters regardless of input language. Reviewed by: Sami Merila --- src/gui/inputmethod/qcoefepinputcontext_p.h | 1 + src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 10 ++++++++++ src/gui/kernel/qt_s60_p.h | 4 +++- src/s60installs/bwins/QtGuiu.def | 1 + src/s60installs/eabi/QtGuiu.def | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h index b17d9c7..d9d577a 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_p.h +++ b/src/gui/inputmethod/qcoefepinputcontext_p.h @@ -225,6 +225,7 @@ private: Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable); Q_GUI_EXPORT void qt_s60_setPartialScreenAutomaticTranslation(bool enable); +Q_GUI_EXPORT void qt_s60_setEditorFlags(int flags); QT_END_NAMESPACE diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 44e0df0..3bcac62 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -367,6 +367,11 @@ Q_GUI_EXPORT void qt_s60_setPartialScreenAutomaticTranslation(bool enable) S60->partial_keyboardAutoTranslation = enable; } +Q_GUI_EXPORT void qt_s60_setEditorFlags(int flags) +{ + S60->editorFlags |= flags; +} + QCoeFepInputContext::QCoeFepInputContext(QObject *parent) : QInputContext(parent), m_fepState(q_check_ptr(new CAknEdwinState)), // CBase derived object needs check on new @@ -1160,6 +1165,11 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } + + if ((hints & (ImhEmailCharactersOnly | ImhUrlCharactersOnly)) && (S60->editorFlags & EAknEditorFlagLatinInputModesOnly)){ + flags |= EAknEditorFlagLatinInputModesOnly; + } + if (needsCharMap) flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 5b5d5ce..c75b20e 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -230,6 +230,7 @@ public: int beginFullScreenCalled : 1; int endFullScreenCalled : 1; + int editorFlags; }; Q_AUTOTEST_EXPORT QS60Data* qGlobalS60Data(); @@ -390,7 +391,8 @@ inline QS60Data::QS60Data() ,s60InstalledTrapHandler(0) #endif ,beginFullScreenCalled(0), - endFullScreenCalled(0) + endFullScreenCalled(0), + editorFlags(0) { } diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index cf6b0da..375f3a2 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -13990,3 +13990,4 @@ EXPORTS ?resetFontEngineCache@QTextEngine@@QAEXXZ @ 13989 NONAME ; void QTextEngine::resetFontEngineCache(void) ?symbianHandleLiteModeStartup@QApplicationPrivate@@QAEXXZ @ 13990 NONAME ; void QApplicationPrivate::symbianHandleLiteModeStartup(void) ?_q_cleanupWinIds@QWidgetPrivate@@QAEXXZ @ 13991 NONAME ; void QWidgetPrivate::_q_cleanupWinIds(void) + ?qt_s60_setEditorFlags@@YAXH@Z @ 13992 NONAME ; void qt_s60_setEditorFlags(int) diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index f667bab..07f0929 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12803,3 +12803,4 @@ EXPORTS _ZN11QTextEngine20resetFontEngineCacheEv @ 12802 NONAME _ZN14QWidgetPrivate16_q_cleanupWinIdsEv @ 12803 NONAME _ZN19QApplicationPrivate28symbianHandleLiteModeStartupEv @ 12804 NONAME + _Z21qt_s60_setEditorFlagsi @ 12805 NONAME -- cgit v0.12 From d72eee36b858b46746fe29dffa02f9501d73e24d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 25 Nov 2011 10:58:00 +0100 Subject: Set execution bits for .test files. These files turn out to be scripts. --- config.profiles/harmattan/rules | 0 config.tests/mac/crc.test | 0 config.tests/mac/defaultarch.test | 0 config.tests/mac/dwarf2.test | 0 config.tests/mac/xarch.test | 0 config.tests/symbian/compile.test | 0 config.tests/unix/bsymbolic_functions.test | 0 config.tests/unix/compile.test | 0 config.tests/unix/doubleformat.test | 0 config.tests/unix/endian.test | 0 config.tests/unix/fvisibility.test | 0 config.tests/unix/objcopy.test | 0 config.tests/unix/precomp.test | 0 config.tests/unix/ptrsize.test | 0 config.tests/unix/which.test | 0 config.tests/x11/notype.test | 0 16 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 config.profiles/harmattan/rules mode change 100644 => 100755 config.tests/mac/crc.test mode change 100644 => 100755 config.tests/mac/defaultarch.test mode change 100644 => 100755 config.tests/mac/dwarf2.test mode change 100644 => 100755 config.tests/mac/xarch.test mode change 100644 => 100755 config.tests/symbian/compile.test mode change 100644 => 100755 config.tests/unix/bsymbolic_functions.test mode change 100644 => 100755 config.tests/unix/compile.test mode change 100644 => 100755 config.tests/unix/doubleformat.test mode change 100644 => 100755 config.tests/unix/endian.test mode change 100644 => 100755 config.tests/unix/fvisibility.test mode change 100644 => 100755 config.tests/unix/objcopy.test mode change 100644 => 100755 config.tests/unix/precomp.test mode change 100644 => 100755 config.tests/unix/ptrsize.test mode change 100644 => 100755 config.tests/unix/which.test mode change 100644 => 100755 config.tests/x11/notype.test diff --git a/config.profiles/harmattan/rules b/config.profiles/harmattan/rules old mode 100644 new mode 100755 diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test old mode 100644 new mode 100755 diff --git a/config.tests/mac/defaultarch.test b/config.tests/mac/defaultarch.test old mode 100644 new mode 100755 diff --git a/config.tests/mac/dwarf2.test b/config.tests/mac/dwarf2.test old mode 100644 new mode 100755 diff --git a/config.tests/mac/xarch.test b/config.tests/mac/xarch.test old mode 100644 new mode 100755 diff --git a/config.tests/symbian/compile.test b/config.tests/symbian/compile.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test old mode 100644 new mode 100755 diff --git a/config.tests/unix/which.test b/config.tests/unix/which.test old mode 100644 new mode 100755 diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test old mode 100644 new mode 100755 -- cgit v0.12 From e4bdb5d8144f62d803f1d904275db91c155d3561 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Thu, 24 Nov 2011 13:15:18 +0100 Subject: SSL: fix build when compiled with -openssl-linked ... and only resolve the functions when the methods are available. SSL 2 functionality is not always available in OpenSSL anymore. Change-Id: Ia3178685b26c67ac55447476789e06710b596181 Reviewed-by: Richard J. Moore Reviewed-by: Shane Kearns (cherry picked from commit 09404c072fec2e195d8114dc4d95ce3683c341cf) --- src/network/ssl/qsslsocket_openssl.cpp | 4 ++++ src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 5f520f7..872b19c 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -254,7 +254,11 @@ bool QSslSocketBackendPrivate::initSslContext() init_context: switch (configuration.protocol) { case QSsl::SslV2: +#ifndef OPENSSL_NO_SSL2 ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); +#else + ctx = 0; // SSL 2 not supported by the system, but chosen deliberately -> error +#endif break; case QSsl::SslV3: ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 90a840f..51ecf5d 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -222,11 +222,15 @@ DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) #if OPENSSL_VERSION_NUMBER >= 0x10000000L +#ifndef OPENSSL_NO_SSL2 DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) +#endif DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) +#ifndef OPENSSL_NO_SSL2 DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) +#endif DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) @@ -741,11 +745,15 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_set_connect_state) RESOLVEFUNC(SSL_shutdown) RESOLVEFUNC(SSL_write) +#ifndef OPENSSL_NO_SSL2 RESOLVEFUNC(SSLv2_client_method) +#endif RESOLVEFUNC(SSLv3_client_method) RESOLVEFUNC(SSLv23_client_method) RESOLVEFUNC(TLSv1_client_method) +#ifndef OPENSSL_NO_SSL2 RESOLVEFUNC(SSLv2_server_method) +#endif RESOLVEFUNC(SSLv3_server_method) RESOLVEFUNC(SSLv23_server_method) RESOLVEFUNC(TLSv1_server_method) -- cgit v0.12 From 013df7417f1496f476c23251a90aa454687d2f74 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 29 Nov 2011 11:58:57 +0100 Subject: Set execution bits for more scripts. --- config.tests/unix/makeabs | 0 config.tests/unix/padstring | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 config.tests/unix/makeabs mode change 100644 => 100755 config.tests/unix/padstring diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs old mode 100644 new mode 100755 diff --git a/config.tests/unix/padstring b/config.tests/unix/padstring old mode 100644 new mode 100755 -- cgit v0.12 From acaffe068f75161f6dd14ecbb0408cdf4c8fc287 Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Tue, 29 Nov 2011 13:29:42 +0200 Subject: Fix Symbian def-file Fix the Symbain bwins def-file QtGuiu.def to include changes caused by commit 6b6397f91125ddfc2abdea9704bbed08beb22ab7. Reviewed-by: Murray Read --- src/s60installs/bwins/QtGuiu.def | 454 +++++++++++++++++++-------------------- 1 file changed, 227 insertions(+), 227 deletions(-) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 375f3a2..6f903fd 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -13118,233 +13118,233 @@ EXPORTS ?aboutToReleaseGpuResources@QApplication@@IAEXXZ @ 13117 NONAME ; void QApplication::aboutToReleaseGpuResources(void) ?emitAboutToUseGpuResources@QApplicationPrivate@@QAEXXZ @ 13118 NONAME ; void QApplicationPrivate::emitAboutToUseGpuResources(void) ?emitAboutToReleaseGpuResources@QApplicationPrivate@@QAEXXZ @ 13119 NONAME ; void QApplicationPrivate::emitAboutToReleaseGpuResources(void) - png_access_version_number @ 13120 NONAME - png_benign_error @ 13121 NONAME - png_build_grayscale_palette @ 13122 NONAME - png_calloc @ 13123 NONAME - png_chunk_benign_error @ 13124 NONAME - png_chunk_error @ 13125 NONAME - png_chunk_warning @ 13126 NONAME - png_convert_from_struct_tm @ 13127 NONAME - png_convert_from_time_t @ 13128 NONAME - png_convert_to_rfc1123 @ 13129 NONAME - png_create_info_struct @ 13130 NONAME - png_create_read_struct @ 13131 NONAME - png_create_read_struct_2 @ 13132 NONAME - png_create_write_struct @ 13133 NONAME - png_create_write_struct_2 @ 13134 NONAME - png_data_freer @ 13135 NONAME - png_destroy_info_struct @ 13136 NONAME - png_destroy_read_struct @ 13137 NONAME - png_destroy_write_struct @ 13138 NONAME - png_error @ 13139 NONAME - png_free @ 13140 NONAME - png_free_data @ 13141 NONAME - png_free_default @ 13142 NONAME - png_get_IHDR @ 13143 NONAME - png_get_PLTE @ 13144 NONAME - png_get_bKGD @ 13145 NONAME - png_get_bit_depth @ 13146 NONAME - png_get_cHRM @ 13147 NONAME - png_get_cHRM_fixed @ 13148 NONAME - png_get_channels @ 13149 NONAME - png_get_chunk_cache_max @ 13150 NONAME - png_get_chunk_malloc_max @ 13151 NONAME - png_get_color_type @ 13152 NONAME - png_get_compression_buffer_size @ 13153 NONAME - png_get_compression_type @ 13154 NONAME - png_get_copyright @ 13155 NONAME - png_get_current_pass_number @ 13156 NONAME - png_get_current_row_number @ 13157 NONAME - png_get_error_ptr @ 13158 NONAME - png_get_filter_type @ 13159 NONAME - png_get_gAMA @ 13160 NONAME - png_get_gAMA_fixed @ 13161 NONAME - png_get_hIST @ 13162 NONAME - png_get_header_ver @ 13163 NONAME - png_get_header_version @ 13164 NONAME - png_get_iCCP @ 13165 NONAME - png_get_image_height @ 13166 NONAME - png_get_image_width @ 13167 NONAME - png_get_int_32 @ 13168 NONAME - png_get_interlace_type @ 13169 NONAME - png_get_io_chunk_name @ 13170 NONAME - png_get_io_chunk_type @ 13171 NONAME - png_get_io_ptr @ 13172 NONAME - png_get_io_state @ 13173 NONAME - png_get_libpng_ver @ 13174 NONAME - png_get_mem_ptr @ 13175 NONAME - png_get_oFFs @ 13176 NONAME - png_get_pCAL @ 13177 NONAME - png_get_pHYs @ 13178 NONAME - png_get_pHYs_dpi @ 13179 NONAME - png_get_pixel_aspect_ratio @ 13180 NONAME - png_get_pixel_aspect_ratio_fixed @ 13181 NONAME - png_get_pixels_per_inch @ 13182 NONAME - png_get_pixels_per_meter @ 13183 NONAME - png_get_progressive_ptr @ 13184 NONAME - png_get_rgb_to_gray_status @ 13185 NONAME - png_get_rowbytes @ 13186 NONAME - png_get_rows @ 13187 NONAME - png_get_sBIT @ 13188 NONAME - png_get_sCAL @ 13189 NONAME - png_get_sCAL_fixed @ 13190 NONAME - png_get_sCAL_s @ 13191 NONAME - png_get_sPLT @ 13192 NONAME - png_get_sRGB @ 13193 NONAME - png_get_signature @ 13194 NONAME - png_get_tIME @ 13195 NONAME - png_get_tRNS @ 13196 NONAME - png_get_text @ 13197 NONAME - png_get_uint_16 @ 13198 NONAME - png_get_uint_31 @ 13199 NONAME - png_get_uint_32 @ 13200 NONAME - png_get_unknown_chunks @ 13201 NONAME - png_get_user_chunk_ptr @ 13202 NONAME - png_get_user_height_max @ 13203 NONAME - png_get_user_transform_ptr @ 13204 NONAME - png_get_user_width_max @ 13205 NONAME - png_get_valid @ 13206 NONAME - png_get_x_offset_inches @ 13207 NONAME - png_get_x_offset_inches_fixed @ 13208 NONAME - png_get_x_offset_microns @ 13209 NONAME - png_get_x_offset_pixels @ 13210 NONAME - png_get_x_pixels_per_inch @ 13211 NONAME - png_get_x_pixels_per_meter @ 13212 NONAME - png_get_y_offset_inches @ 13213 NONAME - png_get_y_offset_inches_fixed @ 13214 NONAME - png_get_y_offset_microns @ 13215 NONAME - png_get_y_offset_pixels @ 13216 NONAME - png_get_y_pixels_per_inch @ 13217 NONAME - png_get_y_pixels_per_meter @ 13218 NONAME - png_handle_as_unknown @ 13219 NONAME - png_info_init_3 @ 13220 NONAME - png_init_io @ 13221 NONAME - png_longjmp @ 13222 NONAME - png_malloc @ 13223 NONAME - png_malloc_default @ 13224 NONAME - png_malloc_warn @ 13225 NONAME - png_permit_mng_features @ 13226 NONAME - png_process_data @ 13227 NONAME - png_process_data_pause @ 13228 NONAME - png_process_data_skip @ 13229 NONAME - png_progressive_combine_row @ 13230 NONAME - png_read_end @ 13231 NONAME - png_read_image @ 13232 NONAME - png_read_info @ 13233 NONAME - png_read_png @ 13234 NONAME - png_read_row @ 13235 NONAME - png_read_rows @ 13236 NONAME - png_read_update_info @ 13237 NONAME - png_reset_zstream @ 13238 NONAME - png_save_int_32 @ 13239 NONAME - png_save_uint_16 @ 13240 NONAME - png_save_uint_32 @ 13241 NONAME - png_set_IHDR @ 13242 NONAME - png_set_PLTE @ 13243 NONAME - png_set_add_alpha @ 13244 NONAME - png_set_alpha_mode @ 13245 NONAME - png_set_alpha_mode_fixed @ 13246 NONAME - png_set_bKGD @ 13247 NONAME - png_set_background @ 13248 NONAME - png_set_background_fixed @ 13249 NONAME - png_set_benign_errors @ 13250 NONAME - png_set_bgr @ 13251 NONAME - png_set_cHRM @ 13252 NONAME - png_set_cHRM_fixed @ 13253 NONAME - png_set_chunk_cache_max @ 13254 NONAME - png_set_chunk_malloc_max @ 13255 NONAME - png_set_compression_buffer_size @ 13256 NONAME - png_set_compression_level @ 13257 NONAME - png_set_compression_mem_level @ 13258 NONAME - png_set_compression_method @ 13259 NONAME - png_set_compression_strategy @ 13260 NONAME - png_set_compression_window_bits @ 13261 NONAME - png_set_crc_action @ 13262 NONAME - png_set_error_fn @ 13263 NONAME - png_set_expand @ 13264 NONAME - png_set_expand_16 @ 13265 NONAME - png_set_expand_gray_1_2_4_to_8 @ 13266 NONAME - png_set_filler @ 13267 NONAME - png_set_filter @ 13268 NONAME - png_set_filter_heuristics @ 13269 NONAME - png_set_filter_heuristics_fixed @ 13270 NONAME - png_set_flush @ 13271 NONAME - png_set_gAMA @ 13272 NONAME - png_set_gAMA_fixed @ 13273 NONAME - png_set_gamma @ 13274 NONAME - png_set_gamma_fixed @ 13275 NONAME - png_set_gray_to_rgb @ 13276 NONAME - png_set_hIST @ 13277 NONAME - png_set_iCCP @ 13278 NONAME - png_set_interlace_handling @ 13279 NONAME - png_set_invalid @ 13280 NONAME - png_set_invert_alpha @ 13281 NONAME - png_set_invert_mono @ 13282 NONAME - png_set_keep_unknown_chunks @ 13283 NONAME - png_set_longjmp_fn @ 13284 NONAME - png_set_mem_fn @ 13285 NONAME - png_set_oFFs @ 13286 NONAME - png_set_pCAL @ 13287 NONAME - png_set_pHYs @ 13288 NONAME - png_set_packing @ 13289 NONAME - png_set_packswap @ 13290 NONAME - png_set_palette_to_rgb @ 13291 NONAME - png_set_progressive_read_fn @ 13292 NONAME - png_set_quantize @ 13293 NONAME - png_set_read_fn @ 13294 NONAME - png_set_read_status_fn @ 13295 NONAME - png_set_read_user_chunk_fn @ 13296 NONAME - png_set_read_user_transform_fn @ 13297 NONAME - png_set_rgb_to_gray @ 13298 NONAME - png_set_rgb_to_gray_fixed @ 13299 NONAME - png_set_rows @ 13300 NONAME - png_set_sBIT @ 13301 NONAME - png_set_sCAL @ 13302 NONAME - png_set_sCAL_fixed @ 13303 NONAME - png_set_sCAL_s @ 13304 NONAME - png_set_sPLT @ 13305 NONAME - png_set_sRGB @ 13306 NONAME - png_set_sRGB_gAMA_and_cHRM @ 13307 NONAME - png_set_scale_16 @ 13308 NONAME - png_set_shift @ 13309 NONAME - png_set_sig_bytes @ 13310 NONAME - png_set_strip_16 @ 13311 NONAME - png_set_strip_alpha @ 13312 NONAME - png_set_swap @ 13313 NONAME - png_set_swap_alpha @ 13314 NONAME - png_set_tIME @ 13315 NONAME - png_set_tRNS @ 13316 NONAME - png_set_tRNS_to_alpha @ 13317 NONAME - png_set_text @ 13318 NONAME - png_set_text_compression_level @ 13319 NONAME - png_set_text_compression_mem_level @ 13320 NONAME - png_set_text_compression_method @ 13321 NONAME - png_set_text_compression_strategy @ 13322 NONAME - png_set_text_compression_window_bits @ 13323 NONAME - png_set_unknown_chunk_location @ 13324 NONAME - png_set_unknown_chunks @ 13325 NONAME - png_set_user_limits @ 13326 NONAME - png_set_user_transform_info @ 13327 NONAME - png_set_write_fn @ 13328 NONAME - png_set_write_status_fn @ 13329 NONAME - png_set_write_user_transform_fn @ 13330 NONAME - png_sig_cmp @ 13331 NONAME - png_start_read_image @ 13332 NONAME - png_warning @ 13333 NONAME - png_write_chunk @ 13334 NONAME - png_write_chunk_data @ 13335 NONAME - png_write_chunk_end @ 13336 NONAME - png_write_chunk_start @ 13337 NONAME - png_write_end @ 13338 NONAME - png_write_flush @ 13339 NONAME - png_write_image @ 13340 NONAME - png_write_info @ 13341 NONAME - png_write_info_before_PLTE @ 13342 NONAME - png_write_png @ 13343 NONAME - png_write_row @ 13344 NONAME - png_write_rows @ 13345 NONAME - png_write_sig @ 13346 NONAME + ?png_access_version_number@PrivatePng@@YAIXZ @ 13120 NONAME ; unsigned int PrivatePng::png_access_version_number(void) + ?png_benign_error@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13121 NONAME ; void PrivatePng::png_benign_error(struct PrivatePng::png_struct_def *, char const *) + ?png_build_grayscale_palette@PrivatePng@@YAXHPAUpng_color_struct@1@@Z @ 13122 NONAME ; void PrivatePng::png_build_grayscale_palette(int, struct PrivatePng::png_color_struct *) + ?png_calloc@PrivatePng@@YAPAXPAUpng_struct_def@1@I@Z @ 13123 NONAME ; void * PrivatePng::png_calloc(struct PrivatePng::png_struct_def *, unsigned int) + ?png_chunk_benign_error@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13124 NONAME ; void PrivatePng::png_chunk_benign_error(struct PrivatePng::png_struct_def *, char const *) + ?png_chunk_error@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13125 NONAME ; void PrivatePng::png_chunk_error(struct PrivatePng::png_struct_def *, char const *) + ?png_chunk_warning@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13126 NONAME ; void PrivatePng::png_chunk_warning(struct PrivatePng::png_struct_def *, char const *) + ?png_convert_from_struct_tm@PrivatePng@@YAXPAUpng_time_struct@1@PBUtm@@@Z @ 13127 NONAME ; void PrivatePng::png_convert_from_struct_tm(struct PrivatePng::png_time_struct *, struct tm const *) + ?png_convert_from_time_t@PrivatePng@@YAXPAUpng_time_struct@1@H@Z @ 13128 NONAME ; void PrivatePng::png_convert_from_time_t(struct PrivatePng::png_time_struct *, int) + ?png_convert_to_rfc1123@PrivatePng@@YAPBDPAUpng_struct_def@1@PBUpng_time_struct@1@@Z @ 13129 NONAME ; char const * PrivatePng::png_convert_to_rfc1123(struct PrivatePng::png_struct_def *, struct PrivatePng::png_time_struct const *) + ?png_create_info_struct@PrivatePng@@YAPAUpng_info_def@1@PAUpng_struct_def@1@@Z @ 13130 NONAME ; struct PrivatePng::png_info_def * PrivatePng::png_create_info_struct(struct PrivatePng::png_struct_def *) + ?png_create_read_struct@PrivatePng@@YAPAUpng_struct_def@1@PBDPAXP6AXPAU21@0@ZP6AX20@Z@Z @ 13131 NONAME ; struct PrivatePng::png_struct_def * PrivatePng::png_create_read_struct(char const *, void *, void (*)(struct PrivatePng::png_struct_def *, char const *), void (*)(struct PrivatePng::png_struct_def *, char const *)) + ?png_create_read_struct_2@PrivatePng@@YAPAUpng_struct_def@1@PBDPAXP6AXPAU21@0@ZP6AX20@Z1P6APAX2I@ZP6AX21@Z@Z @ 13132 NONAME ; struct PrivatePng::png_struct_def * PrivatePng::png_create_read_struct_2(char const *, void *, void (*)(struct PrivatePng::png_struct_def *, char const *), void (*)(struct PrivatePng::png_struct_def *, char const *), void *, void * (*)(struct PrivatePng::png_struct_def *, unsigned int), void (*)(struct PrivatePng::png_struct_def *, void *)) + ?png_create_write_struct@PrivatePng@@YAPAUpng_struct_def@1@PBDPAXP6AXPAU21@0@ZP6AX20@Z@Z @ 13133 NONAME ; struct PrivatePng::png_struct_def * PrivatePng::png_create_write_struct(char const *, void *, void (*)(struct PrivatePng::png_struct_def *, char const *), void (*)(struct PrivatePng::png_struct_def *, char const *)) + ?png_create_write_struct_2@PrivatePng@@YAPAUpng_struct_def@1@PBDPAXP6AXPAU21@0@ZP6AX20@Z1P6APAX2I@ZP6AX21@Z@Z @ 13134 NONAME ; struct PrivatePng::png_struct_def * PrivatePng::png_create_write_struct_2(char const *, void *, void (*)(struct PrivatePng::png_struct_def *, char const *), void (*)(struct PrivatePng::png_struct_def *, char const *), void *, void * (*)(struct PrivatePng::png_struct_def *, unsigned int), void (*)(struct PrivatePng::png_struct_def *, void *)) + ?png_data_freer@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HI@Z @ 13135 NONAME ; void PrivatePng::png_data_freer(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, unsigned int) + ?png_destroy_info_struct@PrivatePng@@YAXPAUpng_struct_def@1@PAPAUpng_info_def@1@@Z @ 13136 NONAME ; void PrivatePng::png_destroy_info_struct(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def * *) + ?png_destroy_read_struct@PrivatePng@@YAXPAPAUpng_struct_def@1@PAPAUpng_info_def@1@1@Z @ 13137 NONAME ; void PrivatePng::png_destroy_read_struct(struct PrivatePng::png_struct_def * *, struct PrivatePng::png_info_def * *, struct PrivatePng::png_info_def * *) + ?png_destroy_write_struct@PrivatePng@@YAXPAPAUpng_struct_def@1@PAPAUpng_info_def@1@@Z @ 13138 NONAME ; void PrivatePng::png_destroy_write_struct(struct PrivatePng::png_struct_def * *, struct PrivatePng::png_info_def * *) + ?png_error@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13139 NONAME ; void PrivatePng::png_error(struct PrivatePng::png_struct_def *, char const *) + ?png_free@PrivatePng@@YAXPAUpng_struct_def@1@PAX@Z @ 13140 NONAME ; void PrivatePng::png_free(struct PrivatePng::png_struct_def *, void *) + ?png_free_data@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@IH@Z @ 13141 NONAME ; void PrivatePng::png_free_data(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned int, int) + ?png_free_default@PrivatePng@@YAXPAUpng_struct_def@1@PAX@Z @ 13142 NONAME ; void PrivatePng::png_free_default(struct PrivatePng::png_struct_def *, void *) + ?png_get_IHDR@PrivatePng@@YAIPAUpng_struct_def@1@PAUpng_info_def@1@PAI2PAH3333@Z @ 13143 NONAME ; unsigned int PrivatePng::png_get_IHDR(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned int *, unsigned int *, int *, int *, int *, int *, int *) + ?png_get_PLTE@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPAUpng_color_struct@1@PAH@Z @ 13144 NONAME ; unsigned int PrivatePng::png_get_PLTE(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, struct PrivatePng::png_color_struct * *, int *) + ?png_get_bKGD@PrivatePng@@YAIPBUpng_struct_def@1@PAUpng_info_def@1@PAPAUpng_color_16_struct@1@@Z @ 13145 NONAME ; unsigned int PrivatePng::png_get_bKGD(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def *, struct PrivatePng::png_color_16_struct * *) + ?png_get_bit_depth@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13146 NONAME ; unsigned char PrivatePng::png_get_bit_depth(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_cHRM@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAN2222222@Z @ 13147 NONAME ; unsigned int PrivatePng::png_get_cHRM(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, double *, double *, double *, double *, double *, double *, double *, double *) + ?png_get_cHRM_fixed@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAH2222222@Z @ 13148 NONAME ; unsigned int PrivatePng::png_get_cHRM_fixed(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *, int *, int *, int *, int *, int *, int *, int *) + ?png_get_channels@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13149 NONAME ; unsigned char PrivatePng::png_get_channels(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_chunk_cache_max@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13150 NONAME ; unsigned int PrivatePng::png_get_chunk_cache_max(struct PrivatePng::png_struct_def const *) + ?png_get_chunk_malloc_max@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13151 NONAME ; unsigned int PrivatePng::png_get_chunk_malloc_max(struct PrivatePng::png_struct_def const *) + ?png_get_color_type@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13152 NONAME ; unsigned char PrivatePng::png_get_color_type(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_compression_buffer_size@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13153 NONAME ; unsigned int PrivatePng::png_get_compression_buffer_size(struct PrivatePng::png_struct_def const *) + ?png_get_compression_type@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13154 NONAME ; unsigned char PrivatePng::png_get_compression_type(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_copyright@PrivatePng@@YAPBDPBUpng_struct_def@1@@Z @ 13155 NONAME ; char const * PrivatePng::png_get_copyright(struct PrivatePng::png_struct_def const *) + ?png_get_current_pass_number@PrivatePng@@YAEPBUpng_struct_def@1@@Z @ 13156 NONAME ; unsigned char PrivatePng::png_get_current_pass_number(struct PrivatePng::png_struct_def const *) + ?png_get_current_row_number@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13157 NONAME ; unsigned int PrivatePng::png_get_current_row_number(struct PrivatePng::png_struct_def const *) + ?png_get_error_ptr@PrivatePng@@YAPAXPBUpng_struct_def@1@@Z @ 13158 NONAME ; void * PrivatePng::png_get_error_ptr(struct PrivatePng::png_struct_def const *) + ?png_get_filter_type@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13159 NONAME ; unsigned char PrivatePng::png_get_filter_type(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_gAMA@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAN@Z @ 13160 NONAME ; unsigned int PrivatePng::png_get_gAMA(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, double *) + ?png_get_gAMA_fixed@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAH@Z @ 13161 NONAME ; unsigned int PrivatePng::png_get_gAMA_fixed(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *) + ?png_get_hIST@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPAG@Z @ 13162 NONAME ; unsigned int PrivatePng::png_get_hIST(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, unsigned short * *) + ?png_get_header_ver@PrivatePng@@YAPBDPBUpng_struct_def@1@@Z @ 13163 NONAME ; char const * PrivatePng::png_get_header_ver(struct PrivatePng::png_struct_def const *) + ?png_get_header_version@PrivatePng@@YAPBDPBUpng_struct_def@1@@Z @ 13164 NONAME ; char const * PrivatePng::png_get_header_version(struct PrivatePng::png_struct_def const *) + ?png_get_iCCP@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPADPAHPAPAEPAI@Z @ 13165 NONAME ; unsigned int PrivatePng::png_get_iCCP(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, char * *, int *, unsigned char * *, unsigned int *) + ?png_get_image_height@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13166 NONAME ; unsigned int PrivatePng::png_get_image_height(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_image_width@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13167 NONAME ; unsigned int PrivatePng::png_get_image_width(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_int_32@PrivatePng@@YAHPBE@Z @ 13168 NONAME ; int PrivatePng::png_get_int_32(unsigned char const *) + ?png_get_interlace_type@PrivatePng@@YAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13169 NONAME ; unsigned char PrivatePng::png_get_interlace_type(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_io_chunk_name@PrivatePng@@YAPBEPAUpng_struct_def@1@@Z @ 13170 NONAME ; unsigned char const * PrivatePng::png_get_io_chunk_name(struct PrivatePng::png_struct_def *) + ?png_get_io_chunk_type@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13171 NONAME ; unsigned int PrivatePng::png_get_io_chunk_type(struct PrivatePng::png_struct_def const *) + ?png_get_io_ptr@PrivatePng@@YAPAXPAUpng_struct_def@1@@Z @ 13172 NONAME ; void * PrivatePng::png_get_io_ptr(struct PrivatePng::png_struct_def *) + ?png_get_io_state@PrivatePng@@YAIPAUpng_struct_def@1@@Z @ 13173 NONAME ; unsigned int PrivatePng::png_get_io_state(struct PrivatePng::png_struct_def *) + ?png_get_libpng_ver@PrivatePng@@YAPBDPBUpng_struct_def@1@@Z @ 13174 NONAME ; char const * PrivatePng::png_get_libpng_ver(struct PrivatePng::png_struct_def const *) + ?png_get_mem_ptr@PrivatePng@@YAPAXPBUpng_struct_def@1@@Z @ 13175 NONAME ; void * PrivatePng::png_get_mem_ptr(struct PrivatePng::png_struct_def const *) + ?png_get_oFFs@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAH22@Z @ 13176 NONAME ; unsigned int PrivatePng::png_get_oFFs(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *, int *, int *) + ?png_get_pCAL@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPADPAH3332PAPAPAD@Z @ 13177 NONAME ; unsigned int PrivatePng::png_get_pCAL(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, char * *, int *, int *, int *, int *, char * *, char * * *) + ?png_get_pHYs@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAI2PAH@Z @ 13178 NONAME ; unsigned int PrivatePng::png_get_pHYs(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, unsigned int *, unsigned int *, int *) + ?png_get_pHYs_dpi@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAI2PAH@Z @ 13179 NONAME ; unsigned int PrivatePng::png_get_pHYs_dpi(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, unsigned int *, unsigned int *, int *) + ?png_get_pixel_aspect_ratio@PrivatePng@@YAMPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13180 NONAME ; float PrivatePng::png_get_pixel_aspect_ratio(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_pixel_aspect_ratio_fixed@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13181 NONAME ; int PrivatePng::png_get_pixel_aspect_ratio_fixed(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_pixels_per_inch@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13182 NONAME ; unsigned int PrivatePng::png_get_pixels_per_inch(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_pixels_per_meter@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13183 NONAME ; unsigned int PrivatePng::png_get_pixels_per_meter(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_progressive_ptr@PrivatePng@@YAPAXPBUpng_struct_def@1@@Z @ 13184 NONAME ; void * PrivatePng::png_get_progressive_ptr(struct PrivatePng::png_struct_def const *) + ?png_get_rgb_to_gray_status@PrivatePng@@YAEPBUpng_struct_def@1@@Z @ 13185 NONAME ; unsigned char PrivatePng::png_get_rgb_to_gray_status(struct PrivatePng::png_struct_def const *) + ?png_get_rowbytes@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13186 NONAME ; unsigned int PrivatePng::png_get_rowbytes(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_rows@PrivatePng@@YAPAPAEPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13187 NONAME ; unsigned char * * PrivatePng::png_get_rows(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_sBIT@PrivatePng@@YAIPBUpng_struct_def@1@PAUpng_info_def@1@PAPAUpng_color_8_struct@1@@Z @ 13188 NONAME ; unsigned int PrivatePng::png_get_sBIT(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def *, struct PrivatePng::png_color_8_struct * *) + ?png_get_sCAL@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAHPAN3@Z @ 13189 NONAME ; unsigned int PrivatePng::png_get_sCAL(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *, double *, double *) + ?png_get_sCAL_fixed@PrivatePng@@YAIPAUpng_struct_def@1@PBUpng_info_def@1@PAH22@Z @ 13190 NONAME ; unsigned int PrivatePng::png_get_sCAL_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def const *, int *, int *, int *) + ?png_get_sCAL_s@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAHPAPAD3@Z @ 13191 NONAME ; unsigned int PrivatePng::png_get_sCAL_s(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *, char * *, char * *) + ?png_get_sPLT@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPAUpng_sPLT_struct@1@@Z @ 13192 NONAME ; unsigned int PrivatePng::png_get_sPLT(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, struct PrivatePng::png_sPLT_struct * *) + ?png_get_sRGB@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAH@Z @ 13193 NONAME ; unsigned int PrivatePng::png_get_sRGB(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, int *) + ?png_get_signature@PrivatePng@@YAPBEPBUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13194 NONAME ; unsigned char const * PrivatePng::png_get_signature(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def *) + ?png_get_tIME@PrivatePng@@YAIPBUpng_struct_def@1@PAUpng_info_def@1@PAPAUpng_time_struct@1@@Z @ 13195 NONAME ; unsigned int PrivatePng::png_get_tIME(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def *, struct PrivatePng::png_time_struct * *) + ?png_get_tRNS@PrivatePng@@YAIPBUpng_struct_def@1@PAUpng_info_def@1@PAPAEPAHPAPAUpng_color_16_struct@1@@Z @ 13196 NONAME ; unsigned int PrivatePng::png_get_tRNS(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def *, unsigned char * *, int *, struct PrivatePng::png_color_16_struct * *) + ?png_get_text@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@PAPAUpng_text_struct@1@PAH@Z @ 13197 NONAME ; unsigned int PrivatePng::png_get_text(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, struct PrivatePng::png_text_struct * *, int *) + ?png_get_uint_16@PrivatePng@@YAGPBE@Z @ 13198 NONAME ; unsigned short PrivatePng::png_get_uint_16(unsigned char const *) + ?png_get_uint_31@PrivatePng@@YAIPAUpng_struct_def@1@PBE@Z @ 13199 NONAME ; unsigned int PrivatePng::png_get_uint_31(struct PrivatePng::png_struct_def *, unsigned char const *) + ?png_get_uint_32@PrivatePng@@YAIPBE@Z @ 13200 NONAME ; unsigned int PrivatePng::png_get_uint_32(unsigned char const *) + ?png_get_unknown_chunks@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@PAPAUpng_unknown_chunk_t@1@@Z @ 13201 NONAME ; int PrivatePng::png_get_unknown_chunks(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, struct PrivatePng::png_unknown_chunk_t * *) + ?png_get_user_chunk_ptr@PrivatePng@@YAPAXPBUpng_struct_def@1@@Z @ 13202 NONAME ; void * PrivatePng::png_get_user_chunk_ptr(struct PrivatePng::png_struct_def const *) + ?png_get_user_height_max@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13203 NONAME ; unsigned int PrivatePng::png_get_user_height_max(struct PrivatePng::png_struct_def const *) + ?png_get_user_transform_ptr@PrivatePng@@YAPAXPBUpng_struct_def@1@@Z @ 13204 NONAME ; void * PrivatePng::png_get_user_transform_ptr(struct PrivatePng::png_struct_def const *) + ?png_get_user_width_max@PrivatePng@@YAIPBUpng_struct_def@1@@Z @ 13205 NONAME ; unsigned int PrivatePng::png_get_user_width_max(struct PrivatePng::png_struct_def const *) + ?png_get_valid@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@I@Z @ 13206 NONAME ; unsigned int PrivatePng::png_get_valid(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *, unsigned int) + ?png_get_x_offset_inches@PrivatePng@@YAMPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13207 NONAME ; float PrivatePng::png_get_x_offset_inches(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_x_offset_inches_fixed@PrivatePng@@YAHPAUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13208 NONAME ; int PrivatePng::png_get_x_offset_inches_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def const *) + ?png_get_x_offset_microns@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13209 NONAME ; int PrivatePng::png_get_x_offset_microns(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_x_offset_pixels@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13210 NONAME ; int PrivatePng::png_get_x_offset_pixels(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_x_pixels_per_inch@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13211 NONAME ; unsigned int PrivatePng::png_get_x_pixels_per_inch(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_x_pixels_per_meter@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13212 NONAME ; unsigned int PrivatePng::png_get_x_pixels_per_meter(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_y_offset_inches@PrivatePng@@YAMPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13213 NONAME ; float PrivatePng::png_get_y_offset_inches(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_y_offset_inches_fixed@PrivatePng@@YAHPAUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13214 NONAME ; int PrivatePng::png_get_y_offset_inches_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def const *) + ?png_get_y_offset_microns@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13215 NONAME ; int PrivatePng::png_get_y_offset_microns(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_y_offset_pixels@PrivatePng@@YAHPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13216 NONAME ; int PrivatePng::png_get_y_offset_pixels(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_y_pixels_per_inch@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13217 NONAME ; unsigned int PrivatePng::png_get_y_pixels_per_inch(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_get_y_pixels_per_meter@PrivatePng@@YAIPBUpng_struct_def@1@PBUpng_info_def@1@@Z @ 13218 NONAME ; unsigned int PrivatePng::png_get_y_pixels_per_meter(struct PrivatePng::png_struct_def const *, struct PrivatePng::png_info_def const *) + ?png_handle_as_unknown@PrivatePng@@YAHPAUpng_struct_def@1@PBE@Z @ 13219 NONAME ; int PrivatePng::png_handle_as_unknown(struct PrivatePng::png_struct_def *, unsigned char const *) + ?png_info_init_3@PrivatePng@@YAXPAPAUpng_info_def@1@I@Z @ 13220 NONAME ; void PrivatePng::png_info_init_3(struct PrivatePng::png_info_def * *, unsigned int) + ?png_init_io@PrivatePng@@YAXPAUpng_struct_def@1@PAU__sFILE@@@Z @ 13221 NONAME ; void PrivatePng::png_init_io(struct PrivatePng::png_struct_def *, struct __sFILE *) + ?png_longjmp@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13222 NONAME ; void PrivatePng::png_longjmp(struct PrivatePng::png_struct_def *, int) + ?png_malloc@PrivatePng@@YAPAXPAUpng_struct_def@1@I@Z @ 13223 NONAME ; void * PrivatePng::png_malloc(struct PrivatePng::png_struct_def *, unsigned int) + ?png_malloc_default@PrivatePng@@YAPAXPAUpng_struct_def@1@I@Z @ 13224 NONAME ; void * PrivatePng::png_malloc_default(struct PrivatePng::png_struct_def *, unsigned int) + ?png_malloc_warn@PrivatePng@@YAPAXPAUpng_struct_def@1@I@Z @ 13225 NONAME ; void * PrivatePng::png_malloc_warn(struct PrivatePng::png_struct_def *, unsigned int) + ?png_permit_mng_features@PrivatePng@@YAIPAUpng_struct_def@1@I@Z @ 13226 NONAME ; unsigned int PrivatePng::png_permit_mng_features(struct PrivatePng::png_struct_def *, unsigned int) + ?png_process_data@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PAEI@Z @ 13227 NONAME ; void PrivatePng::png_process_data(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned char *, unsigned int) + ?png_process_data_pause@PrivatePng@@YAIPAUpng_struct_def@1@H@Z @ 13228 NONAME ; unsigned int PrivatePng::png_process_data_pause(struct PrivatePng::png_struct_def *, int) + ?png_process_data_skip@PrivatePng@@YAIPAUpng_struct_def@1@@Z @ 13229 NONAME ; unsigned int PrivatePng::png_process_data_skip(struct PrivatePng::png_struct_def *) + ?png_progressive_combine_row@PrivatePng@@YAXPAUpng_struct_def@1@PAEPBE@Z @ 13230 NONAME ; void PrivatePng::png_progressive_combine_row(struct PrivatePng::png_struct_def *, unsigned char *, unsigned char const *) + ?png_read_end@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13231 NONAME ; void PrivatePng::png_read_end(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_read_image@PrivatePng@@YAXPAUpng_struct_def@1@PAPAE@Z @ 13232 NONAME ; void PrivatePng::png_read_image(struct PrivatePng::png_struct_def *, unsigned char * *) + ?png_read_info@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13233 NONAME ; void PrivatePng::png_read_info(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_read_png@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HPAX@Z @ 13234 NONAME ; void PrivatePng::png_read_png(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, void *) + ?png_read_row@PrivatePng@@YAXPAUpng_struct_def@1@PAE1@Z @ 13235 NONAME ; void PrivatePng::png_read_row(struct PrivatePng::png_struct_def *, unsigned char *, unsigned char *) + ?png_read_rows@PrivatePng@@YAXPAUpng_struct_def@1@PAPAE1I@Z @ 13236 NONAME ; void PrivatePng::png_read_rows(struct PrivatePng::png_struct_def *, unsigned char * *, unsigned char * *, unsigned int) + ?png_read_update_info@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13237 NONAME ; void PrivatePng::png_read_update_info(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_reset_zstream@PrivatePng@@YAHPAUpng_struct_def@1@@Z @ 13238 NONAME ; int PrivatePng::png_reset_zstream(struct PrivatePng::png_struct_def *) + ?png_save_int_32@PrivatePng@@YAXPAEH@Z @ 13239 NONAME ; void PrivatePng::png_save_int_32(unsigned char *, int) + ?png_save_uint_16@PrivatePng@@YAXPAEI@Z @ 13240 NONAME ; void PrivatePng::png_save_uint_16(unsigned char *, unsigned int) + ?png_save_uint_32@PrivatePng@@YAXPAEI@Z @ 13241 NONAME ; void PrivatePng::png_save_uint_32(unsigned char *, unsigned int) + ?png_set_IHDR@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@IIHHHHH@Z @ 13242 NONAME ; void PrivatePng::png_set_IHDR(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned int, unsigned int, int, int, int, int, int) + ?png_set_PLTE@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_color_struct@1@H@Z @ 13243 NONAME ; void PrivatePng::png_set_PLTE(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_color_struct const *, int) + ?png_set_add_alpha@PrivatePng@@YAXPAUpng_struct_def@1@IH@Z @ 13244 NONAME ; void PrivatePng::png_set_add_alpha(struct PrivatePng::png_struct_def *, unsigned int, int) + ?png_set_alpha_mode@PrivatePng@@YAXPAUpng_struct_def@1@HN@Z @ 13245 NONAME ; void PrivatePng::png_set_alpha_mode(struct PrivatePng::png_struct_def *, int, double) + ?png_set_alpha_mode_fixed@PrivatePng@@YAXPAUpng_struct_def@1@HH@Z @ 13246 NONAME ; void PrivatePng::png_set_alpha_mode_fixed(struct PrivatePng::png_struct_def *, int, int) + ?png_set_bKGD@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_color_16_struct@1@@Z @ 13247 NONAME ; void PrivatePng::png_set_bKGD(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_color_16_struct const *) + ?png_set_background@PrivatePng@@YAXPAUpng_struct_def@1@PBUpng_color_16_struct@1@HHN@Z @ 13248 NONAME ; void PrivatePng::png_set_background(struct PrivatePng::png_struct_def *, struct PrivatePng::png_color_16_struct const *, int, int, double) + ?png_set_background_fixed@PrivatePng@@YAXPAUpng_struct_def@1@PBUpng_color_16_struct@1@HHH@Z @ 13249 NONAME ; void PrivatePng::png_set_background_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_color_16_struct const *, int, int, int) + ?png_set_benign_errors@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13250 NONAME ; void PrivatePng::png_set_benign_errors(struct PrivatePng::png_struct_def *, int) + ?png_set_bgr@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13251 NONAME ; void PrivatePng::png_set_bgr(struct PrivatePng::png_struct_def *) + ?png_set_cHRM@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@NNNNNNNN@Z @ 13252 NONAME ; void PrivatePng::png_set_cHRM(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, double, double, double, double, double, double, double, double) + ?png_set_cHRM_fixed@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HHHHHHHH@Z @ 13253 NONAME ; void PrivatePng::png_set_cHRM_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, int, int, int, int, int, int, int) + ?png_set_chunk_cache_max@PrivatePng@@YAXPAUpng_struct_def@1@I@Z @ 13254 NONAME ; void PrivatePng::png_set_chunk_cache_max(struct PrivatePng::png_struct_def *, unsigned int) + ?png_set_chunk_malloc_max@PrivatePng@@YAXPAUpng_struct_def@1@I@Z @ 13255 NONAME ; void PrivatePng::png_set_chunk_malloc_max(struct PrivatePng::png_struct_def *, unsigned int) + ?png_set_compression_buffer_size@PrivatePng@@YAXPAUpng_struct_def@1@I@Z @ 13256 NONAME ; void PrivatePng::png_set_compression_buffer_size(struct PrivatePng::png_struct_def *, unsigned int) + ?png_set_compression_level@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13257 NONAME ; void PrivatePng::png_set_compression_level(struct PrivatePng::png_struct_def *, int) + ?png_set_compression_mem_level@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13258 NONAME ; void PrivatePng::png_set_compression_mem_level(struct PrivatePng::png_struct_def *, int) + ?png_set_compression_method@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13259 NONAME ; void PrivatePng::png_set_compression_method(struct PrivatePng::png_struct_def *, int) + ?png_set_compression_strategy@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13260 NONAME ; void PrivatePng::png_set_compression_strategy(struct PrivatePng::png_struct_def *, int) + ?png_set_compression_window_bits@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13261 NONAME ; void PrivatePng::png_set_compression_window_bits(struct PrivatePng::png_struct_def *, int) + ?png_set_crc_action@PrivatePng@@YAXPAUpng_struct_def@1@HH@Z @ 13262 NONAME ; void PrivatePng::png_set_crc_action(struct PrivatePng::png_struct_def *, int, int) + ?png_set_error_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6AX0PBD@ZP6AX02@Z@Z @ 13263 NONAME ; void PrivatePng::png_set_error_fn(struct PrivatePng::png_struct_def *, void *, void (*)(struct PrivatePng::png_struct_def *, char const *), void (*)(struct PrivatePng::png_struct_def *, char const *)) + ?png_set_expand@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13264 NONAME ; void PrivatePng::png_set_expand(struct PrivatePng::png_struct_def *) + ?png_set_expand_16@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13265 NONAME ; void PrivatePng::png_set_expand_16(struct PrivatePng::png_struct_def *) + ?png_set_expand_gray_1_2_4_to_8@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13266 NONAME ; void PrivatePng::png_set_expand_gray_1_2_4_to_8(struct PrivatePng::png_struct_def *) + ?png_set_filler@PrivatePng@@YAXPAUpng_struct_def@1@IH@Z @ 13267 NONAME ; void PrivatePng::png_set_filler(struct PrivatePng::png_struct_def *, unsigned int, int) + ?png_set_filter@PrivatePng@@YAXPAUpng_struct_def@1@HH@Z @ 13268 NONAME ; void PrivatePng::png_set_filter(struct PrivatePng::png_struct_def *, int, int) + ?png_set_filter_heuristics@PrivatePng@@YAXPAUpng_struct_def@1@HHPBN1@Z @ 13269 NONAME ; void PrivatePng::png_set_filter_heuristics(struct PrivatePng::png_struct_def *, int, int, double const *, double const *) + ?png_set_filter_heuristics_fixed@PrivatePng@@YAXPAUpng_struct_def@1@HHPBH1@Z @ 13270 NONAME ; void PrivatePng::png_set_filter_heuristics_fixed(struct PrivatePng::png_struct_def *, int, int, int const *, int const *) + ?png_set_flush@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13271 NONAME ; void PrivatePng::png_set_flush(struct PrivatePng::png_struct_def *, int) + ?png_set_gAMA@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@N@Z @ 13272 NONAME ; void PrivatePng::png_set_gAMA(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, double) + ?png_set_gAMA_fixed@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@H@Z @ 13273 NONAME ; void PrivatePng::png_set_gAMA_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int) + ?png_set_gamma@PrivatePng@@YAXPAUpng_struct_def@1@NN@Z @ 13274 NONAME ; void PrivatePng::png_set_gamma(struct PrivatePng::png_struct_def *, double, double) + ?png_set_gamma_fixed@PrivatePng@@YAXPAUpng_struct_def@1@HH@Z @ 13275 NONAME ; void PrivatePng::png_set_gamma_fixed(struct PrivatePng::png_struct_def *, int, int) + ?png_set_gray_to_rgb@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13276 NONAME ; void PrivatePng::png_set_gray_to_rgb(struct PrivatePng::png_struct_def *) + ?png_set_hIST@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBG@Z @ 13277 NONAME ; void PrivatePng::png_set_hIST(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned short const *) + ?png_set_iCCP@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBDHPBEI@Z @ 13278 NONAME ; void PrivatePng::png_set_iCCP(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, char const *, int, unsigned char const *, unsigned int) + ?png_set_interlace_handling@PrivatePng@@YAHPAUpng_struct_def@1@@Z @ 13279 NONAME ; int PrivatePng::png_set_interlace_handling(struct PrivatePng::png_struct_def *) + ?png_set_invalid@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@H@Z @ 13280 NONAME ; void PrivatePng::png_set_invalid(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int) + ?png_set_invert_alpha@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13281 NONAME ; void PrivatePng::png_set_invert_alpha(struct PrivatePng::png_struct_def *) + ?png_set_invert_mono@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13282 NONAME ; void PrivatePng::png_set_invert_mono(struct PrivatePng::png_struct_def *) + ?png_set_keep_unknown_chunks@PrivatePng@@YAXPAUpng_struct_def@1@HPBEH@Z @ 13283 NONAME ; void PrivatePng::png_set_keep_unknown_chunks(struct PrivatePng::png_struct_def *, int, unsigned char const *, int) + ?png_set_longjmp_fn@PrivatePng@@YAPAY0BA@KPAUpng_struct_def@1@P6AXQAKH@ZI@Z @ 13284 NONAME ; unsigned long [16] * PrivatePng::png_set_longjmp_fn(struct PrivatePng::png_struct_def *, void (*)(unsigned long * const, int), unsigned int) + ?png_set_mem_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6APAX0I@ZP6AX01@Z@Z @ 13285 NONAME ; void PrivatePng::png_set_mem_fn(struct PrivatePng::png_struct_def *, void *, void * (*)(struct PrivatePng::png_struct_def *, unsigned int), void (*)(struct PrivatePng::png_struct_def *, void *)) + ?png_set_oFFs@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HHH@Z @ 13286 NONAME ; void PrivatePng::png_set_oFFs(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, int, int) + ?png_set_pCAL@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBDHHHH2PAPAD@Z @ 13287 NONAME ; void PrivatePng::png_set_pCAL(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, char const *, int, int, int, int, char const *, char * *) + ?png_set_pHYs@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@IIH@Z @ 13288 NONAME ; void PrivatePng::png_set_pHYs(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned int, unsigned int, int) + ?png_set_packing@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13289 NONAME ; void PrivatePng::png_set_packing(struct PrivatePng::png_struct_def *) + ?png_set_packswap@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13290 NONAME ; void PrivatePng::png_set_packswap(struct PrivatePng::png_struct_def *) + ?png_set_palette_to_rgb@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13291 NONAME ; void PrivatePng::png_set_palette_to_rgb(struct PrivatePng::png_struct_def *) + ?png_set_progressive_read_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6AX0PAUpng_info_def@1@@ZP6AX0PAEIH@ZP6AX02@Z@Z @ 13292 NONAME ; void PrivatePng::png_set_progressive_read_fn(struct PrivatePng::png_struct_def *, void *, void (*)(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *), void (*)(struct PrivatePng::png_struct_def *, unsigned char *, unsigned int, int), void (*)(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *)) + ?png_set_quantize@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_color_struct@1@HHPBGH@Z @ 13293 NONAME ; void PrivatePng::png_set_quantize(struct PrivatePng::png_struct_def *, struct PrivatePng::png_color_struct *, int, int, unsigned short const *, int) + ?png_set_read_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6AX0PAEI@Z@Z @ 13294 NONAME ; void PrivatePng::png_set_read_fn(struct PrivatePng::png_struct_def *, void *, void (*)(struct PrivatePng::png_struct_def *, unsigned char *, unsigned int)) + ?png_set_read_status_fn@PrivatePng@@YAXPAUpng_struct_def@1@P6AX0IH@Z@Z @ 13295 NONAME ; void PrivatePng::png_set_read_status_fn(struct PrivatePng::png_struct_def *, void (*)(struct PrivatePng::png_struct_def *, unsigned int, int)) + ?png_set_read_user_chunk_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6AH0PAUpng_unknown_chunk_t@1@@Z@Z @ 13296 NONAME ; void PrivatePng::png_set_read_user_chunk_fn(struct PrivatePng::png_struct_def *, void *, int (*)(struct PrivatePng::png_struct_def *, struct PrivatePng::png_unknown_chunk_t *)) + ?png_set_read_user_transform_fn@PrivatePng@@YAXPAUpng_struct_def@1@P6AX0PAUpng_row_info_struct@1@PAE@Z@Z @ 13297 NONAME ; void PrivatePng::png_set_read_user_transform_fn(struct PrivatePng::png_struct_def *, void (*)(struct PrivatePng::png_struct_def *, struct PrivatePng::png_row_info_struct *, unsigned char *)) + ?png_set_rgb_to_gray@PrivatePng@@YAXPAUpng_struct_def@1@HNN@Z @ 13298 NONAME ; void PrivatePng::png_set_rgb_to_gray(struct PrivatePng::png_struct_def *, int, double, double) + ?png_set_rgb_to_gray_fixed@PrivatePng@@YAXPAUpng_struct_def@1@HHH@Z @ 13299 NONAME ; void PrivatePng::png_set_rgb_to_gray_fixed(struct PrivatePng::png_struct_def *, int, int, int) + ?png_set_rows@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PAPAE@Z @ 13300 NONAME ; void PrivatePng::png_set_rows(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned char * *) + ?png_set_sBIT@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_color_8_struct@1@@Z @ 13301 NONAME ; void PrivatePng::png_set_sBIT(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_color_8_struct const *) + ?png_set_sCAL@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HNN@Z @ 13302 NONAME ; void PrivatePng::png_set_sCAL(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, double, double) + ?png_set_sCAL_fixed@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HHH@Z @ 13303 NONAME ; void PrivatePng::png_set_sCAL_fixed(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, int, int) + ?png_set_sCAL_s@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HPBD2@Z @ 13304 NONAME ; void PrivatePng::png_set_sCAL_s(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, char const *, char const *) + ?png_set_sPLT@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_sPLT_struct@1@H@Z @ 13305 NONAME ; void PrivatePng::png_set_sPLT(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_sPLT_struct const *, int) + ?png_set_sRGB@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@H@Z @ 13306 NONAME ; void PrivatePng::png_set_sRGB(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int) + ?png_set_sRGB_gAMA_and_cHRM@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@H@Z @ 13307 NONAME ; void PrivatePng::png_set_sRGB_gAMA_and_cHRM(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int) + ?png_set_scale_16@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13308 NONAME ; void PrivatePng::png_set_scale_16(struct PrivatePng::png_struct_def *) + ?png_set_shift@PrivatePng@@YAXPAUpng_struct_def@1@PBUpng_color_8_struct@1@@Z @ 13309 NONAME ; void PrivatePng::png_set_shift(struct PrivatePng::png_struct_def *, struct PrivatePng::png_color_8_struct const *) + ?png_set_sig_bytes@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13310 NONAME ; void PrivatePng::png_set_sig_bytes(struct PrivatePng::png_struct_def *, int) + ?png_set_strip_16@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13311 NONAME ; void PrivatePng::png_set_strip_16(struct PrivatePng::png_struct_def *) + ?png_set_strip_alpha@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13312 NONAME ; void PrivatePng::png_set_strip_alpha(struct PrivatePng::png_struct_def *) + ?png_set_swap@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13313 NONAME ; void PrivatePng::png_set_swap(struct PrivatePng::png_struct_def *) + ?png_set_swap_alpha@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13314 NONAME ; void PrivatePng::png_set_swap_alpha(struct PrivatePng::png_struct_def *) + ?png_set_tIME@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_time_struct@1@@Z @ 13315 NONAME ; void PrivatePng::png_set_tIME(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_time_struct const *) + ?png_set_tRNS@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBEHPBUpng_color_16_struct@1@@Z @ 13316 NONAME ; void PrivatePng::png_set_tRNS(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, unsigned char const *, int, struct PrivatePng::png_color_16_struct const *) + ?png_set_tRNS_to_alpha@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13317 NONAME ; void PrivatePng::png_set_tRNS_to_alpha(struct PrivatePng::png_struct_def *) + ?png_set_text@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_text_struct@1@H@Z @ 13318 NONAME ; void PrivatePng::png_set_text(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_text_struct const *, int) + ?png_set_text_compression_level@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13319 NONAME ; void PrivatePng::png_set_text_compression_level(struct PrivatePng::png_struct_def *, int) + ?png_set_text_compression_mem_level@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13320 NONAME ; void PrivatePng::png_set_text_compression_mem_level(struct PrivatePng::png_struct_def *, int) + ?png_set_text_compression_method@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13321 NONAME ; void PrivatePng::png_set_text_compression_method(struct PrivatePng::png_struct_def *, int) + ?png_set_text_compression_strategy@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13322 NONAME ; void PrivatePng::png_set_text_compression_strategy(struct PrivatePng::png_struct_def *, int) + ?png_set_text_compression_window_bits@PrivatePng@@YAXPAUpng_struct_def@1@H@Z @ 13323 NONAME ; void PrivatePng::png_set_text_compression_window_bits(struct PrivatePng::png_struct_def *, int) + ?png_set_unknown_chunk_location@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HH@Z @ 13324 NONAME ; void PrivatePng::png_set_unknown_chunk_location(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, int) + ?png_set_unknown_chunks@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@PBUpng_unknown_chunk_t@1@H@Z @ 13325 NONAME ; void PrivatePng::png_set_unknown_chunks(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, struct PrivatePng::png_unknown_chunk_t const *, int) + ?png_set_user_limits@PrivatePng@@YAXPAUpng_struct_def@1@II@Z @ 13326 NONAME ; void PrivatePng::png_set_user_limits(struct PrivatePng::png_struct_def *, unsigned int, unsigned int) + ?png_set_user_transform_info@PrivatePng@@YAXPAUpng_struct_def@1@PAXHH@Z @ 13327 NONAME ; void PrivatePng::png_set_user_transform_info(struct PrivatePng::png_struct_def *, void *, int, int) + ?png_set_write_fn@PrivatePng@@YAXPAUpng_struct_def@1@PAXP6AX0PAEI@ZP6AX0@Z@Z @ 13328 NONAME ; void PrivatePng::png_set_write_fn(struct PrivatePng::png_struct_def *, void *, void (*)(struct PrivatePng::png_struct_def *, unsigned char *, unsigned int), void (*)(struct PrivatePng::png_struct_def *)) + ?png_set_write_status_fn@PrivatePng@@YAXPAUpng_struct_def@1@P6AX0IH@Z@Z @ 13329 NONAME ; void PrivatePng::png_set_write_status_fn(struct PrivatePng::png_struct_def *, void (*)(struct PrivatePng::png_struct_def *, unsigned int, int)) + ?png_set_write_user_transform_fn@PrivatePng@@YAXPAUpng_struct_def@1@P6AX0PAUpng_row_info_struct@1@PAE@Z@Z @ 13330 NONAME ; void PrivatePng::png_set_write_user_transform_fn(struct PrivatePng::png_struct_def *, void (*)(struct PrivatePng::png_struct_def *, struct PrivatePng::png_row_info_struct *, unsigned char *)) + ?png_sig_cmp@PrivatePng@@YAHPBEII@Z @ 13331 NONAME ; int PrivatePng::png_sig_cmp(unsigned char const *, unsigned int, unsigned int) + ?png_start_read_image@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13332 NONAME ; void PrivatePng::png_start_read_image(struct PrivatePng::png_struct_def *) + ?png_warning@PrivatePng@@YAXPAUpng_struct_def@1@PBD@Z @ 13333 NONAME ; void PrivatePng::png_warning(struct PrivatePng::png_struct_def *, char const *) + ?png_write_chunk@PrivatePng@@YAXPAUpng_struct_def@1@PBE1I@Z @ 13334 NONAME ; void PrivatePng::png_write_chunk(struct PrivatePng::png_struct_def *, unsigned char const *, unsigned char const *, unsigned int) + ?png_write_chunk_data@PrivatePng@@YAXPAUpng_struct_def@1@PBEI@Z @ 13335 NONAME ; void PrivatePng::png_write_chunk_data(struct PrivatePng::png_struct_def *, unsigned char const *, unsigned int) + ?png_write_chunk_end@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13336 NONAME ; void PrivatePng::png_write_chunk_end(struct PrivatePng::png_struct_def *) + ?png_write_chunk_start@PrivatePng@@YAXPAUpng_struct_def@1@PBEI@Z @ 13337 NONAME ; void PrivatePng::png_write_chunk_start(struct PrivatePng::png_struct_def *, unsigned char const *, unsigned int) + ?png_write_end@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13338 NONAME ; void PrivatePng::png_write_end(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_write_flush@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13339 NONAME ; void PrivatePng::png_write_flush(struct PrivatePng::png_struct_def *) + ?png_write_image@PrivatePng@@YAXPAUpng_struct_def@1@PAPAE@Z @ 13340 NONAME ; void PrivatePng::png_write_image(struct PrivatePng::png_struct_def *, unsigned char * *) + ?png_write_info@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13341 NONAME ; void PrivatePng::png_write_info(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_write_info_before_PLTE@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@@Z @ 13342 NONAME ; void PrivatePng::png_write_info_before_PLTE(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *) + ?png_write_png@PrivatePng@@YAXPAUpng_struct_def@1@PAUpng_info_def@1@HPAX@Z @ 13343 NONAME ; void PrivatePng::png_write_png(struct PrivatePng::png_struct_def *, struct PrivatePng::png_info_def *, int, void *) + ?png_write_row@PrivatePng@@YAXPAUpng_struct_def@1@PBE@Z @ 13344 NONAME ; void PrivatePng::png_write_row(struct PrivatePng::png_struct_def *, unsigned char const *) + ?png_write_rows@PrivatePng@@YAXPAUpng_struct_def@1@PAPAEI@Z @ 13345 NONAME ; void PrivatePng::png_write_rows(struct PrivatePng::png_struct_def *, unsigned char * *, unsigned int) + ?png_write_sig@PrivatePng@@YAXPAUpng_struct_def@1@@Z @ 13346 NONAME ; void PrivatePng::png_write_sig(struct PrivatePng::png_struct_def *) ?clipEnabledChanged@QBlitterPaintEngine@@UAEXXZ @ 13347 NONAME ; void QBlitterPaintEngine::clipEnabledChanged(void) ?qt_static_metacall@QEventDispatcherS60@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13348 NONAME ; void QEventDispatcherS60::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *) ?supportsSubPixelPositions@QFontEngine@@UBE_NXZ @ 13349 NONAME ; bool QFontEngine::supportsSubPixelPositions(void) const -- cgit v0.12 From 20a154ffc3afacdbc22d00a3c4dd0a2916a14e33 Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Tue, 29 Nov 2011 17:45:27 +0200 Subject: Symbian-linux crosscompilation configuration align Change the configure-sh on Symbian linux crosscompilation to set rtti. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14361 --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 37c306d..5a5ef1d 100755 --- a/configure +++ b/configure @@ -7443,9 +7443,10 @@ if [ "$CFG_EXCEPTIONS" != "no" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions" fi -if [ "$XPLATFORM_MINGW" = "yes" ]; then +if [ "$XPLATFORM_MINGW" = "yes" ] || [ "$XPLATFORM_SYMBIAN" = "yes" ]; then # mkspecs/features/win32/default_pre.prf sets "no-rtti". - # Follow default behavior of configure.exe by overriding with "rtti". + # Follow default behavior of configure.exe by overriding with "rtti" + # (also on Symbian). QTCONFIG_CONFIG="$QTCONFIG_CONFIG rtti" fi -- cgit v0.12 From 1ba0ce0cc1ab94f1397114ac8024a60dc7dfbdd8 Mon Sep 17 00:00:00 2001 From: Honglei Zhang Date: Wed, 30 Nov 2011 13:26:22 +0200 Subject: QSQLITE support only one statement at a time SQLite driver support only one statement at a time. This fix makes the exec and prepare call failed if more than one statements are given. This is bug fix for QTBUG-21884. Also the behaviour is documented in the API specification. Task-number: QTBUG-21884 Reviewed-by: Charles Yin --- src/sql/drivers/sqlite/qsql_sqlite.cpp | 11 ++++++-- src/sql/kernel/qsqlquery.cpp | 6 +++++ tests/auto/qsqlquery/tst_qsqlquery.cpp | 47 ++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 9fba6d6..8294a55 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -322,12 +322,14 @@ bool QSQLiteResult::prepare(const QString &query) setSelect(false); + const void *pzTail = NULL; + #if (SQLITE_VERSION_NUMBER >= 3003011) int res = sqlite3_prepare16_v2(d->access, query.constData(), (query.size() + 1) * sizeof(QChar), - &d->stmt, 0); + &d->stmt, &pzTail); #else int res = sqlite3_prepare16(d->access, query.constData(), (query.size() + 1) * sizeof(QChar), - &d->stmt, 0); + &d->stmt, &pzTail); #endif if (res != SQLITE_OK) { @@ -335,6 +337,11 @@ bool QSQLiteResult::prepare(const QString &query) "Unable to execute statement"), QSqlError::StatementError, res)); d->finalize(); return false; + } else if (pzTail && !QString(reinterpret_cast(pzTail)).trimmed().isEmpty()) { + setLastError(qMakeError(d->access, QCoreApplication::translate("QSQLiteResult", + "Unable to execute multiple statements at a time"), QSqlError::StatementError, SQLITE_MISUSE)); + d->finalize(); + return false; } return true; } diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp index 361730a..753e4f8 100644 --- a/src/sql/kernel/qsqlquery.cpp +++ b/src/sql/kernel/qsqlquery.cpp @@ -338,6 +338,9 @@ bool QSqlQuery::isNull(int field) const Note that the last error for this query is reset when exec() is called. + For SQLite, the query string can contain only one statement at a time. + If more than one statements is give, the function returns false. + Example: \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 34 @@ -887,6 +890,9 @@ void QSqlQuery::clear() syntactically wrong query succeeds, but every consecutive exec() will fail. + For SQLite, the query string can contain only one statement at a time. + If more than one statements are give, the function returns false. + Example: \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 9 diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index 592b49a..3cbdb63 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -213,6 +213,8 @@ private slots: void QTBUG_5765(); void QTBUG_14132_data() { generic_data("QOCI"); } void QTBUG_14132(); + void QTBUG_21884_data() { generic_data("QSQLITE"); } + void QTBUG_21884(); void sqlite_constraint_data() { generic_data("QSQLITE"); } void sqlite_constraint(); @@ -328,6 +330,7 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db ) << qTableName("bug6421", __FILE__).toUpper() << qTableName("bug5765", __FILE__) << qTableName("bug6852", __FILE__) + << qTableName("bug21884", __FILE__) << qTableName( "qtest_lockedtable", __FILE__ ) << qTableName( "Planet", __FILE__ ) << qTableName( "task_250026", __FILE__ ) @@ -3104,6 +3107,50 @@ void tst_QSqlQuery::QTBUG_5765() QCOMPARE(q.value(0).toInt(), 123); } +/** +* This test case tests multiple statements in one execution. +* Sqlite driver doesn't support multiple statement at one time. +* If more than one statement is given, the exec or prepare function +* return failure to the client. +*/ +void tst_QSqlQuery::QTBUG_21884() +{ + QFETCH(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + + QSqlQuery q(db); + + QStringList stList; + QString tableName(qTableName("bug21884", __FILE__ )); + stList << "create table " + tableName + "(id integer primary key, note string)"; + stList << "select * from " + tableName + ";"; + stList << "select * from " + tableName + "; \t\n\r"; + stList << "drop table " + tableName; + + + foreach (const QString& st, stList) { + QVERIFY_SQL(q, exec(st)); + } + + foreach (const QString& st, stList) { + QVERIFY_SQL(q, prepare(st)); + QVERIFY_SQL(q, exec()); + } + + stList.clear(); + stList << "create table " + tableName + "(id integer primary key); select * from " + tableName; + stList << "create table " + tableName + "(id integer primary key); syntax error!;"; + stList << "create table " + tableName + "(id integer primary key);;"; + stList << "create table " + tableName + "(id integer primary key);\'\"\a\b\b\v"; + + foreach (const QString&st , stList) { + QVERIFY2(!q.prepare(st), qPrintable(QString("the statement is expected to fail! ") + st)); + QVERIFY2(!q.exec(st), qPrintable(QString("the statement is expected to fail! ") + st)); + } +} + + void tst_QSqlQuery::oraOCINumber() { QFETCH( QString, dbName ); -- cgit v0.12 From 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c Mon Sep 17 00:00:00 2001 From: Honglei Zhang Date: Wed, 30 Nov 2011 13:36:40 +0200 Subject: Fix sqlite driver memory eating due to close failure If an ongoing query is not finalized before close function is called, sqlite driver still tries to close the connection to sqlite. In this case, sqlite reports an error to sqlite driver which is not reported to the client. The failure in close causes connection to sqlite unclosed and memory is not freed. This fix tries to finalize all queries before close function is called. The close function should succeed. Task-number: QTBUG-16967 Reviewed-by: Charles Yin --- src/sql/drivers/sqlite/qsql_sqlite.cpp | 7 +++++ tests/auto/qsqlquery/tst_qsqlquery.cpp | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 8294a55..38e4a63 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -104,6 +104,7 @@ class QSQLiteDriverPrivate public: inline QSQLiteDriverPrivate() : access(0) {} sqlite3 *access; + QList results; }; @@ -286,10 +287,12 @@ QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db) { d = new QSQLiteResultPrivate(this); d->access = db->d->access; + db->d->results.append(this); } QSQLiteResult::~QSQLiteResult() { + qobject_cast(driver())->d->results.removeOne(this); d->cleanup(); delete d; } @@ -553,6 +556,10 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c void QSQLiteDriver::close() { if (isOpen()) { + foreach (QSQLiteResult *result, d->results) { + result->d->finalize(); + } + if (sqlite3_close(d->access) != SQLITE_OK) setLastError(qMakeError(d->access, tr("Error closing database"), QSqlError::ConnectionError)); diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index 3cbdb63..652a82e 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -215,6 +215,8 @@ private slots: void QTBUG_14132(); void QTBUG_21884_data() { generic_data("QSQLITE"); } void QTBUG_21884(); + void QTBUG_16967_data() { generic_data("QSQLITE"); } + void QTBUG_16967(); //clean close void sqlite_constraint_data() { generic_data("QSQLITE"); } void sqlite_constraint(); @@ -3150,6 +3152,53 @@ void tst_QSqlQuery::QTBUG_21884() } } +/** + * This test case test sqlite driver close function. Sqlite driver should close cleanly + * even if there is still outstanding prepared statement. + */ +void tst_QSqlQuery::QTBUG_16967() +{ + QFETCH(QString, dbName); + { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + db.close(); + QCOMPARE(db.lastError().type(), QSqlError::NoError); + } + { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + QSqlQuery q(db); + q.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);"); + db.close(); + QCOMPARE(db.lastError().type(), QSqlError::NoError); + } + { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + QSqlQuery q(db); + q.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);"); + q.exec(); + db.close(); + QCOMPARE(db.lastError().type(), QSqlError::NoError); + } + { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + QSqlQuery q(db); + q.exec("INSERT INTO t1 (id, str) VALUES(1, \"test1\");"); + db.close(); + QCOMPARE(db.lastError().type(), QSqlError::NoError); + } + { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + QSqlQuery q(db); + q.exec("SELECT * FROM t1;"); + db.close(); + QCOMPARE(db.lastError().type(), QSqlError::NoError); + } +} void tst_QSqlQuery::oraOCINumber() { -- cgit v0.12 From 8752faf0564bed86396b01529dc8ef5064150f4c Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Wed, 30 Nov 2011 14:41:39 +0200 Subject: Fix memory leaks in OpenVG and OpenGL resource pools Task-number: QTBUG-22743 Reviewed-by: Murray Read --- src/opengl/qgltexturepool.cpp | 6 ++---- src/openvg/qvgimagepool.cpp | 13 ++----------- src/openvg/qvgimagepool_p.h | 4 ---- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/opengl/qgltexturepool.cpp b/src/opengl/qgltexturepool.cpp index 9ad66f2..d19b1db 100644 --- a/src/opengl/qgltexturepool.cpp +++ b/src/opengl/qgltexturepool.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE Q_OPENGL_EXPORT extern QGLWidget* qt_gl_share_widget(); -static QGLTexturePool *qt_gl_texture_pool = 0; +Q_GLOBAL_STATIC(QGLTexturePool, qt_gl_texture_pool) class QGLTexturePoolPrivate { @@ -69,9 +69,7 @@ QGLTexturePool::~QGLTexturePool() QGLTexturePool *QGLTexturePool::instance() { - if (!qt_gl_texture_pool) - qt_gl_texture_pool = new QGLTexturePool(); - return qt_gl_texture_pool; + return qt_gl_texture_pool(); } GLuint QGLTexturePool::createTexture(GLenum target, diff --git a/src/openvg/qvgimagepool.cpp b/src/openvg/qvgimagepool.cpp index 3a187b0..cd1caf4 100644 --- a/src/openvg/qvgimagepool.cpp +++ b/src/openvg/qvgimagepool.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -static QVGImagePool *qt_vg_image_pool = 0; +Q_GLOBAL_STATIC(QVGImagePool, qt_vg_image_pool) class QVGImagePoolPrivate { @@ -66,16 +66,7 @@ QVGImagePool::~QVGImagePool() QVGImagePool *QVGImagePool::instance() { - if (!qt_vg_image_pool) - qt_vg_image_pool = new QVGImagePool(); - return qt_vg_image_pool; -} - -void QVGImagePool::setImagePool(QVGImagePool *pool) -{ - if (qt_vg_image_pool != pool) - delete qt_vg_image_pool; - qt_vg_image_pool = pool; + return qt_vg_image_pool(); } VGImage QVGImagePool::createTemporaryImage(VGImageFormat format, diff --git a/src/openvg/qvgimagepool_p.h b/src/openvg/qvgimagepool_p.h index 07c57bf..e4fd4e1 100644 --- a/src/openvg/qvgimagepool_p.h +++ b/src/openvg/qvgimagepool_p.h @@ -69,10 +69,6 @@ public: static QVGImagePool *instance(); - // This function can be used from system-specific graphics system - // plugins to alter the image allocation strategy. - static void setImagePool(QVGImagePool *pool); - // Create a new VGImage from the pool with the specified parameters // that is not associated with a pixmap. The VGImage is returned to // the pool when releaseImage() is called. -- cgit v0.12 From 9b40e102cc76666dfa76a7b0e3d1339d672d8a95 Mon Sep 17 00:00:00 2001 From: Ari Lehtola Date: Tue, 29 Nov 2011 10:08:05 +0200 Subject: CBA comes on top of option menu Layout has changed so that option menu starts from bottom of screen. CBA is set behind in this case Reviewed-by: Miikka Heikkinen Task-number: ou1cimx1#932398 --- src/gui/kernel/qsoftkeymanager_s60.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index 999fccc..4d58baa 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -104,8 +104,13 @@ void QSoftKeyManagerPrivateS60::ensureCbaVisibilityAndResponsiviness(CEikButtonG { RDrawableWindow *cbaWindow = cba.DrawableWindow(); Q_ASSERT_X(cbaWindow, Q_FUNC_INFO, "Native CBA does not have window!"); - // Make sure CBA is visible, i.e. CBA window is on top - cbaWindow->SetOrdinalPosition(0); + // CBA comes on top of new option menu + int pos = 0; + + if(cba.ButtonGroupType()== SLafButtonGroupContainer::ECba) + pos = 1; + + cbaWindow->SetOrdinalPosition(pos); // Qt shares same CBA instance between top-level widgets, // make sure we are not faded by underlying window. cbaWindow->SetFaded(EFalse, RWindowTreeNode::EFadeIncludeChildren); -- cgit v0.12 From e443cd2cfead3d0d6c53adcd4366cc18bd253096 Mon Sep 17 00:00:00 2001 From: Marko Kenttala Date: Wed, 30 Nov 2011 09:57:47 +0200 Subject: Lightmaps demo Symbian fix Enabling night mode does not work on Symbian devices as it uses difference composition mode which is not available. Application changed to use raster graphics engine which supports difference composition mode. Task-number: ou1cimx1#932185 Reviewed-by: Murray Read --- demos/embedded/lightmaps/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/embedded/lightmaps/main.cpp b/demos/embedded/lightmaps/main.cpp index 85f74e6..f9b6fb0 100644 --- a/demos/embedded/lightmaps/main.cpp +++ b/demos/embedded/lightmaps/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) { -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) || defined(Q_OS_SYMBIAN) QApplication::setGraphicsSystem("raster"); #endif -- cgit v0.12 From be34b17416535a3bd257398e089ad285ee3a2d77 Mon Sep 17 00:00:00 2001 From: Satyam Bandarapu Date: Mon, 28 Nov 2011 16:25:14 +0200 Subject: Freezing Def files in Qt Adding unfrozen exports to def files in Qt Reviewed-by: mread --- src/s60installs/bwins/QtCoreu.def | 1 + src/s60installs/bwins/QtGuiu.def | 9 ++++++++- src/s60installs/bwins/QtNetworku.def | 2 ++ src/s60installs/bwins/QtOpenGLu.def | 2 ++ src/s60installs/eabi/QtCoreu.def | 1 + src/s60installs/eabi/QtGuiu.def | 7 +++++++ src/s60installs/eabi/QtNetworku.def | 2 ++ src/s60installs/eabi/QtOpenGLu.def | 1 + 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index 9181dd7..08c67e0 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4885,4 +4885,5 @@ EXPORTS ?updateDir@QFactoryLoader@@QAEXABVQString@@AAVQSettings@@@Z @ 4884 NONAME ; void QFactoryLoader::updateDir(class QString const &, class QSettings &) ?disconnectNotify@QFutureWatcherBase@@MAEXPBD@Z @ 4885 NONAME ; void QFutureWatcherBase::disconnectNotify(char const *) ?maybeQueueForLater@QActiveObject@@QAE_NXZ @ 4886 NONAME ; bool QActiveObject::maybeQueueForLater(void) + ?activeObjectError@QEventDispatcherSymbian@@QAEXH@Z @ 4887 NONAME ; void QEventDispatcherSymbian::activeObjectError(int) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 6f903fd..4e0d7df 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -13990,4 +13990,11 @@ EXPORTS ?resetFontEngineCache@QTextEngine@@QAEXXZ @ 13989 NONAME ; void QTextEngine::resetFontEngineCache(void) ?symbianHandleLiteModeStartup@QApplicationPrivate@@QAEXXZ @ 13990 NONAME ; void QApplicationPrivate::symbianHandleLiteModeStartup(void) ?_q_cleanupWinIds@QWidgetPrivate@@QAEXXZ @ 13991 NONAME ; void QWidgetPrivate::_q_cleanupWinIds(void) - ?qt_s60_setEditorFlags@@YAXH@Z @ 13992 NONAME ; void qt_s60_setEditorFlags(int) + ?qt_s60_setEditorFlags@@YAXH@Z @ 13992 NONAME ; void qt_s60_setEditorFlags(int) + ?adjustViewOptionsForIndex@QTreeViewPrivate@@UBEXPAVQStyleOptionViewItemV4@@ABVQModelIndex@@@Z @ 13993 NONAME ; void QTreeViewPrivate::adjustViewOptionsForIndex(class QStyleOptionViewItemV4 *, class QModelIndex const &) const + ?setNativePaintMode@QSymbianGraphicsSystemHelper@@SAXPAVQWidget@@W4NativePaintMode@1@@Z @ 13994 NONAME ; void QSymbianGraphicsSystemHelper::setNativePaintMode(class QWidget *, enum QSymbianGraphicsSystemHelper::NativePaintMode) + ?calcLogicalIndices@QTreeViewPrivate@@QBEXPAV?$QVector@H@@PAV?$QVector@W4ViewItemPosition@QStyleOptionViewItemV4@@@@@Z @ 13995 NONAME ; void QTreeViewPrivate::calcLogicalIndices(class QVector *, class QVector *) const + ?setReceiveNativePaintEvents@QSymbianGraphicsSystemHelper@@SAXPAVQWidget@@_N@Z @ 13996 NONAME ; void QSymbianGraphicsSystemHelper::setReceiveNativePaintEvents(class QWidget *, bool) + ?setNativePaintMode@QSymbianGraphicsSystemHelper@@SAXPAVCCoeControl@@W4NativePaintMode@1@@Z @ 13997 NONAME ; void QSymbianGraphicsSystemHelper::setNativePaintMode(class CCoeControl *, enum QSymbianGraphicsSystemHelper::NativePaintMode) + ?setIgnoreFocusChanged@QSymbianGraphicsSystemHelper@@SAXPAVQWidget@@_N@Z @ 13998 NONAME ; void QSymbianGraphicsSystemHelper::setIgnoreFocusChanged(class QWidget *, bool) + diff --git a/src/s60installs/bwins/QtNetworku.def b/src/s60installs/bwins/QtNetworku.def index 2f8a7de..e03c024 100644 --- a/src/s60installs/bwins/QtNetworku.def +++ b/src/s60installs/bwins/QtNetworku.def @@ -1258,4 +1258,6 @@ EXPORTS ?metaObject@QHttpMultiPart@@UBEPBUQMetaObject@@XZ @ 1257 NONAME ; struct QMetaObject const * QHttpMultiPart::metaObject(void) const ?qt_static_metacall@QNetworkSession@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1258 NONAME ; void QNetworkSession::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *) ?startPolling@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1259 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void) + ?testSslOption@QSslConfiguration@@QBE_NW4SslOption@QSsl@@@Z @ 1260 NONAME ; bool QSslConfiguration::testSslOption(enum QSsl::SslOption) const + ?setSslOption@QSslConfiguration@@QAEXW4SslOption@QSsl@@_N@Z @ 1261 NONAME ; void QSslConfiguration::setSslOption(enum QSsl::SslOption, bool) diff --git a/src/s60installs/bwins/QtOpenGLu.def b/src/s60installs/bwins/QtOpenGLu.def index 664e981..ed73a33 100644 --- a/src/s60installs/bwins/QtOpenGLu.def +++ b/src/s60installs/bwins/QtOpenGLu.def @@ -878,4 +878,6 @@ EXPORTS ?glGetShaderPrecisionFormat@QGLFunctions@@QAEXIIPAH0@Z @ 877 NONAME ; void QGLFunctions::glGetShaderPrecisionFormat(unsigned int, unsigned int, int *, int *) ?qt_static_metacall@QGLShaderProgram@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 878 NONAME ; void QGLShaderProgram::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *) ?insert@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 879 NONAME ; void QGLContextGroupResourceBase::insert(class QGLContext const *, void *) + ?contextDeleted@QGLContextGroupResourceBase@@UAEXPBVQGLContext@@@Z @ 880 NONAME ; void QGLContextGroupResourceBase::contextDeleted(class QGLContext const *) + ?contextDeleted@QGLTextureGlyphCache@@UAEXPBVQGLContext@@@Z @ 881 NONAME ; void QGLTextureGlyphCache::contextDeleted(class QGLContext const *) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index 5436390..d80aecb 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -4165,4 +4165,5 @@ EXPORTS _ZN14QFactoryLoader9updateDirERK7QStringR9QSettings @ 4164 NONAME _ZN23QCoreApplicationPrivate26rebuildInstallLibraryPathsEv @ 4165 NONAME _ZN13QActiveObject18maybeQueueForLaterEv @ 4166 NONAME + _ZN23QEventDispatcherSymbian17activeObjectErrorEi @ 4167 NONAME diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 07f0929..8aaa65d 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12804,3 +12804,10 @@ EXPORTS _ZN14QWidgetPrivate16_q_cleanupWinIdsEv @ 12803 NONAME _ZN19QApplicationPrivate28symbianHandleLiteModeStartupEv @ 12804 NONAME _Z21qt_s60_setEditorFlagsi @ 12805 NONAME + _ZN28QSymbianGraphicsSystemHelper18setNativePaintModeEP11CCoeControlNS_15NativePaintModeE @ 12806 NONAME + _ZN28QSymbianGraphicsSystemHelper18setNativePaintModeEP7QWidgetNS_15NativePaintModeE @ 12807 NONAME + _ZN28QSymbianGraphicsSystemHelper21setIgnoreFocusChangedEP7QWidgetb @ 12808 NONAME + _ZN28QSymbianGraphicsSystemHelper27setReceiveNativePaintEventsEP7QWidgetb @ 12809 NONAME + _ZNK16QTreeViewPrivate18calcLogicalIndicesEP7QVectorIiEPS0_IN22QStyleOptionViewItemV416ViewItemPositionEE @ 12810 NONAME + _ZNK16QTreeViewPrivate25adjustViewOptionsForIndexEP22QStyleOptionViewItemV4RK11QModelIndex @ 12811 NONAME + diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index 6e7dedd..54f5b5f 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1270,4 +1270,6 @@ EXPORTS _ZNK9QHttpParteqERKS_ @ 1269 NONAME _ZTI14QHttpMultiPart @ 1270 NONAME _ZTV14QHttpMultiPart @ 1271 NONAME + _ZN17QSslConfiguration12setSslOptionEN4QSsl9SslOptionEb @ 1272 NONAME + _ZNK17QSslConfiguration13testSslOptionEN4QSsl9SslOptionE @ 1273 NONAME diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def index 2d9aa8f..edb5e03 100644 --- a/src/s60installs/eabi/QtOpenGLu.def +++ b/src/s60installs/eabi/QtOpenGLu.def @@ -782,4 +782,5 @@ EXPORTS _ZThn104_N20QGLTextureGlyphCacheD0Ev @ 781 NONAME _ZThn104_N20QGLTextureGlyphCacheD1Ev @ 782 NONAME _ZThn8_NK16QGLWindowSurface8featuresEv @ 783 NONAME + _ZN27QGLContextGroupResourceBase14contextDeletedEPK10QGLContext @ 784 NONAME -- cgit v0.12 From fd25323de7b5d5f3e0ffb1bd81ea4d251e071566 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 29 Nov 2011 20:55:26 +0100 Subject: QTreeView: fix crash when starting a drag with hidden columns. Crash was introduced by d639105759491 (Qt-4.8 only) Amended to remove "unused variable" warning. Task-number: QTBUG-15834 Merge-request: MR-2725 Reviewed-by: Gabriel --- src/gui/itemviews/qtreeview.cpp | 16 +++++++++--- tests/auto/qtreeview/tst_qtreeview.cpp | 45 ++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index 868cd92..b678801 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 logicalIndices; - QVector viewItemPosList; // vector of left/middle/end for each logicalIndex + QVector logicalIndices; // index = visual index of visible columns only. data = logical index. + QVector 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); } 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(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() - << 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() - << 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() - << 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() - << new QStandardItem("Beginning") << checkable << checked << new QStandardItem("End") ); + << new QStandardItem("Beginning") << new QStandardItem("Hidden") << checkable << checked << new QStandardItem("End") ); model.appendRow(QList() - << 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() - << 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() - << 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() - << 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() - << 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() - << 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() - << 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 { -- cgit v0.12 From df91fb87623d4908495c4093a3ef817cb7c82fcd Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 30 Nov 2011 15:06:08 +0100 Subject: Remove more "unused variable" warnings Reviewed-by: Frederik --- src/gui/itemviews/qtreeview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index b678801..1fbf69c 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -2927,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++) @@ -2935,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); } @@ -2944,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++) @@ -2952,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); } -- cgit v0.12 From 67d146092a6c11f1ca3c622ae0737202ca292a58 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Wed, 30 Nov 2011 13:39:23 +0000 Subject: Backport SMP safe initialisation of QNetworkConfigurationManager The original commit in Qt5 uses new atomics API that is not in Qt4. I have replaced with equivalent calls. Also the init/cleanup functions are different, so those are renamed. Reviewed-by: mread Task-number: ou1cimx1#946677 Original commit message follows: Author: Thiago Macieira Date: Wed Jul 6 00:06:15 2011 +0200 Fix the QNetworkConnectionManagerPrivate initialisation code. The current code was meant to be a thread-safe initialisation that also ran a couple of extra steps. But it wasn't. While it's ok to call qAddPostRoutine(), the call to updateConfigurations() was thread-unsafe. It is possible that another thread got the pointer to the Private before updateConfigurations() finished. So instead protect the initialisation with a mutex. It's possible that the value of the pointer becomes visible to other processors before the other contained values, so use atomics here. To call qAddPostRoutine safely from the main thread, use the trick of deleteLater() (which is thread-safe) in another thread connecting to a slot. --- src/network/bearer/qnetworkconfigmanager.cpp | 66 ++++++++++++++++++---------- src/network/bearer/qnetworkconfigmanager_p.h | 3 ++ 2 files changed, 47 insertions(+), 22 deletions(-) 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 #include +#include +#include +#include #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE -#define Q_GLOBAL_STATIC_QAPP_DESTRUCTION(TYPE, NAME) \ - static QGlobalStatic 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 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; -- cgit v0.12 From 916076bfec520210966f67ae211af65b21a29dac Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Thu, 24 Nov 2011 11:40:52 +0000 Subject: Symbian - prefer sessions started by this process to choose proxy When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread --- src/corelib/kernel/qcore_symbian_p.cpp | 32 ++++++++++++ src/corelib/kernel/qcore_symbian_p.h | 22 +++++++++ src/network/kernel/qnetworkproxy_symbian.cpp | 27 ++++++++++ .../bearer/symbian/qnetworksession_impl.cpp | 57 +++++++++++++++++----- src/plugins/bearer/symbian/qnetworksession_impl.h | 3 ++ src/s60installs/bwins/QtCoreu.def | 5 +- src/s60installs/eabi/QtCoreu.def | 5 +- 7 files changed, 137 insertions(+), 14 deletions(-) diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp index 4f953a7..65ec3fe 100644 --- a/src/corelib/kernel/qcore_symbian_p.cpp +++ b/src/corelib/kernel/qcore_symbian_p.cpp @@ -246,6 +246,38 @@ RConnection* QSymbianSocketManager::defaultConnection() const return iDefaultConnection; } +void QSymbianSocketManager::addActiveConnection(TUint32 identifier) +{ + QMutexLocker l(&iMutex); + activeConnectionsMap[identifier]++; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "addActiveConnection" << identifier << activeConnectionsMap[identifier]; +#endif +} + +void QSymbianSocketManager::removeActiveConnection(TUint32 identifier) +{ + QMutexLocker l(&iMutex); + int& val(activeConnectionsMap[identifier]); + Q_ASSERT(val > 0); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "removeActiveConnection" << identifier << val - 1; +#endif + if (val <= 1) + activeConnectionsMap.remove(identifier); + else + val--; +} + +QList QSymbianSocketManager::activeConnections() const +{ + QMutexLocker l(&iMutex); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "activeConnections" << activeConnectionsMap.keys(); +#endif + return activeConnectionsMap.keys(); +} + Q_GLOBAL_STATIC(QSymbianSocketManager, qt_symbianSocketManager); QSymbianSocketManager& QSymbianSocketManager::instance() diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h index a8f576d..6176ab5 100644 --- a/src/corelib/kernel/qcore_symbian_p.h +++ b/src/corelib/kernel/qcore_symbian_p.h @@ -247,6 +247,27 @@ public: /*! \internal + Add an opened connection to the active list + \param an open connection + */ + void addActiveConnection(TUint32 identifier); + + /*! + \internal + Remove a connection from the active list + \param a closed connection + */ + void removeActiveConnection(TUint32 identifier); + + /*! + \internal + Add an opened connection to the active list + \param an open connection + */ + QList activeConnections() const; + + /*! + \internal Gets a reference to the singleton socket manager */ static QSymbianSocketManager& instance(); @@ -258,6 +279,7 @@ private: int iNextSocket; QHash socketMap; QHash reverseSocketMap; + QHash activeConnectionsMap; mutable QMutex iMutex; RSocketServ iSocketServ; RConnection *iDefaultConnection; diff --git a/src/network/kernel/qnetworkproxy_symbian.cpp b/src/network/kernel/qnetworkproxy_symbian.cpp index 73068d6..e96c372 100644 --- a/src/network/kernel/qnetworkproxy_symbian.cpp +++ b/src/network/kernel/qnetworkproxy_symbian.cpp @@ -60,6 +60,7 @@ #include #include #include +#include using namespace CommsDat; @@ -73,6 +74,25 @@ public: void setIapId(TUint32 iapId) { valid = true; id = iapId; } bool isValid() { return valid; } TUint32 iapId() { return id; } + static SymbianIapId fromConfiguration(const QNetworkConfiguration& config) + { + SymbianIapId iapId; + // Note: the following code assumes that the identifier is in format + // I_xxxx where xxxx is the identifier of IAP. This is meant as a + // temporary solution until there is a support for returning + // implementation specific identifier. + const int generalPartLength = 2; + QString idString(config.identifier().mid(generalPartLength)); + bool success; + uint id = idString.toUInt(&success); + if (success) + iapId.setIapId(id); + else + qWarning() << "Failed to convert identifier to access point identifier: " + << config.identifier(); + return iapId; + } + private: bool valid; TUint32 id; @@ -122,9 +142,16 @@ QNetworkConfiguration SymbianProxyQuery::findCurrentConfigurationFromServiceNetw QNetworkConfiguration SymbianProxyQuery::findCurrentConfiguration(QNetworkConfigurationManager& configurationManager) { + QList openConfigurations = QSymbianSocketManager::instance().activeConnections(); QList activeConfigurations = configurationManager.allConfigurations( QNetworkConfiguration::Active); + for (int i = 0; i < activeConfigurations.count(); i++) { + // get first configuration which was opened by this process + if (openConfigurations.contains(SymbianIapId::fromConfiguration(activeConfigurations.at(i)).iapId())) + return activeConfigurations.at(i); + } if (activeConfigurations.count() > 0) { + // get first active configuration opened by any process return activeConfigurations.at(0); } else { // No active configurations, try default one diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp index f5f71cf..58ce8fe 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp @@ -64,7 +64,7 @@ QNetworkSessionPrivateImpl::QNetworkSessionPrivateImpl(SymbianEngine *engine) ipConnectionNotifier(0), ipConnectionStarter(0), iHandleStateNotificationsFromManager(false), iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iError(QNetworkSession::UnknownSessionError), iALREnabled(0), - iConnectInBackground(false), isOpening(false) + iConnectInBackground(false), iCurrentIap(0), isOpening(false) { #ifdef SNAP_FUNCTIONALITY_AVAILABLE @@ -77,6 +77,7 @@ QNetworkSessionPrivateImpl::QNetworkSessionPrivateImpl(SymbianEngine *engine) void QNetworkSessionPrivateImpl::closeHandles() { QMutexLocker lock(&mutex); + updateCurrentIap(0); // Cancel Connection Progress Notifications first. // Note: ConnectionNotifier must be destroyed before RConnection::Close() // => deleting ipConnectionNotifier results RConnection::CancelProgressNotification() @@ -637,6 +638,8 @@ void QNetworkSessionPrivateImpl::accept() QSymbianSocketManager::instance().setDefaultConnection(&iConnection); + updateCurrentIap(iNewRoamingIap); + newState(QNetworkSession::Connected, iNewRoamingIap); } #endif @@ -867,19 +870,31 @@ quint64 QNetworkSessionPrivateImpl::activeTime() const return startTime.secsTo(QDateTime::currentDateTime()); } -QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 iapId) const +bool QNetworkSessionPrivateImpl::activeIapId(TUint32& iapId) const { - if (iapId == 0) { - _LIT(KSetting, "IAP\\Id"); - iConnection.GetIntSetting(KSetting, iapId); + if (!iConnection.SubSessionHandle()) + return false; + _LIT(KSetting, "IAP\\Id"); + TInt err = iConnection.GetIntSetting(KSetting, iapId); + if (err != KErrNone) + return false; #ifdef SNAP_FUNCTIONALITY_AVAILABLE - // Check if this is an Easy WLAN configuration. On Symbian^3 RConnection may report - // the used configuration as 'EasyWLAN' IAP ID if someone has just opened the configuration - // from WLAN Scan dialog, _and_ that connection is still up. We need to find the - // real matching configuration. Function alters the Easy WLAN ID to real IAP ID (only if - // easy WLAN): - easyWlanTrueIapId(iapId); + // Check if this is an Easy WLAN configuration. On Symbian^3 RConnection may report + // the used configuration as 'EasyWLAN' IAP ID if someone has just opened the configuration + // from WLAN Scan dialog, _and_ that connection is still up. We need to find the + // real matching configuration. Function alters the Easy WLAN ID to real IAP ID (only if + // easy WLAN): + easyWlanTrueIapId(iapId); #endif + return true; +} + +QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 iapId) const +{ + if (iapId == 0) { + bool ok = activeIapId(iapId); + if (!ok) + return QNetworkConfiguration(); } #ifdef SNAP_FUNCTIONALITY_AVAILABLE @@ -1015,6 +1030,20 @@ QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 ia return publicConfig; } +void QNetworkSessionPrivateImpl::updateCurrentIap(TUint32 iapId) +{ + if (iCurrentIap == iapId) + return; + + if (iCurrentIap != 0) + QSymbianSocketManager::instance().removeActiveConnection(iCurrentIap); + + iCurrentIap = iapId; + + if (iCurrentIap != 0) + QSymbianSocketManager::instance().addActiveConnection(iCurrentIap); +} + void QNetworkSessionPrivateImpl::ConnectionStartComplete(TInt statusCode) { #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG @@ -1028,7 +1057,10 @@ void QNetworkSessionPrivateImpl::ConnectionStartComplete(TInt statusCode) case KErrNone: // Connection created successfully { TInt error = KErrNone; - QNetworkConfiguration newActiveConfig = activeConfiguration(); + TUint32 iapId; + QNetworkConfiguration newActiveConfig; + if (activeIapId(iapId)) + newActiveConfig = activeConfiguration(iapId); if (!newActiveConfig.isValid()) { // RConnection startup was successful but no configuration // was found. That indicates that user has chosen to create a @@ -1038,6 +1070,7 @@ void QNetworkSessionPrivateImpl::ConnectionStartComplete(TInt statusCode) error = KErrGeneral; } else { QSymbianSocketManager::instance().setDefaultConnection(&iConnection); + updateCurrentIap(iapId); } if (error != KErrNone) { isOpen = false; diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h index 17a051e..9e02e5b 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.h +++ b/src/plugins/bearer/symbian/qnetworksession_impl.h @@ -143,6 +143,8 @@ private: void handleSymbianConnectionStatusChange(TInt aConnectionStatus, TInt aError, TUint accessPointId = 0); QNetworkConfiguration bestConfigFromSNAP(const QNetworkConfiguration& snapConfig) const; QNetworkConfiguration activeConfiguration(TUint32 iapId = 0) const; + bool activeIapId(TUint32 &iapId) const; + void updateCurrentIap(TUint32 iapId); #ifndef QT_NO_NETWORKINTERFACE QNetworkInterface interface(TUint iapId) const; #endif @@ -186,6 +188,7 @@ private: // data TUint32 iOldRoamingIap; TUint32 iNewRoamingIap; + TUint32 iCurrentIap; bool isOpening; diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index 08c67e0..cfd2cec 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4885,5 +4885,8 @@ EXPORTS ?updateDir@QFactoryLoader@@QAEXABVQString@@AAVQSettings@@@Z @ 4884 NONAME ; void QFactoryLoader::updateDir(class QString const &, class QSettings &) ?disconnectNotify@QFutureWatcherBase@@MAEXPBD@Z @ 4885 NONAME ; void QFutureWatcherBase::disconnectNotify(char const *) ?maybeQueueForLater@QActiveObject@@QAE_NXZ @ 4886 NONAME ; bool QActiveObject::maybeQueueForLater(void) - ?activeObjectError@QEventDispatcherSymbian@@QAEXH@Z @ 4887 NONAME ; void QEventDispatcherSymbian::activeObjectError(int) + ?activeConnections@QSymbianSocketManager@@QBE?AV?$QList@K@@XZ @ 4887 NONAME ; class QList QSymbianSocketManager::activeConnections(void) const + ?removeActiveConnection@QSymbianSocketManager@@QAEXK@Z @ 4888 NONAME ; void QSymbianSocketManager::removeActiveConnection(unsigned long) + ?addActiveConnection@QSymbianSocketManager@@QAEXK@Z @ 4889 NONAME ; void QSymbianSocketManager::addActiveConnection(unsigned long) + ?activeObjectError@QEventDispatcherSymbian@@QAEXH@Z @ 4890 NONAME ; void QEventDispatcherSymbian::activeObjectError(int) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index d80aecb..44aa48c 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -4165,5 +4165,8 @@ EXPORTS _ZN14QFactoryLoader9updateDirERK7QStringR9QSettings @ 4164 NONAME _ZN23QCoreApplicationPrivate26rebuildInstallLibraryPathsEv @ 4165 NONAME _ZN13QActiveObject18maybeQueueForLaterEv @ 4166 NONAME - _ZN23QEventDispatcherSymbian17activeObjectErrorEi @ 4167 NONAME + _ZN21QSymbianSocketManager19addActiveConnectionEm @ 4167 NONAME + _ZN21QSymbianSocketManager22removeActiveConnectionEm @ 4168 NONAME + _ZN23QEventDispatcherSymbian17activeObjectErrorEi @ 4169 NONAME + _ZNK21QSymbianSocketManager17activeConnectionsEv @ 4170 NONAME -- cgit v0.12 From 8a76e0e327ba6330e1520fdd898a7dcf57a9bf2a Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Thu, 24 Nov 2011 16:49:23 +0000 Subject: doc - document symbian behaviour of QFile::link Task-number: ou1cimx1#943243 Reviewed-by: mread --- src/corelib/io/qfile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index cdee7ce..09d0c58 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -824,8 +824,7 @@ QFile::rename(const QString &oldName, const QString &newName) \note To create a valid link on Windows, \a linkName must have a \c{.lnk} file extension. - \note On Symbian, no link is created and false is returned if fileName() - currently specifies a directory. + \note Symbian filesystem does not support links. \sa setFileName() */ -- cgit v0.12 From 70c1e9589bf390bc3010663f133d87a789f17c3e Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 30 Nov 2011 20:21:24 +0100 Subject: fixed error generating wrong introspection string in header output file When using dbus introspection files with CRLF encoding the CR is not handled and results into a CR code at a wrong location in the output file Task-number: QTBUG-17634 Merge-request: 1478 Reviewed-by: thiago --- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v0.12 From 27c322e0f88fa0cccba8cf914655cacb5dae51de Mon Sep 17 00:00:00 2001 From: Takumi ASAKI Date: Wed, 30 Nov 2011 20:29:29 +0100 Subject: Qt Linguist: Fix crashes Fix crash when select translation after close and open file. This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20 Merge-request: 1480 Reviewed-by: Oswald Buddenhagen --- tools/linguist/linguist/messageeditor.cpp | 12 ++++++++---- tools/linguist/linguist/messageeditor.h | 2 +- tools/linguist/linguist/messageeditorwidgets.cpp | 9 ++++++--- tools/linguist/linguist/messageeditorwidgets.h | 5 ++++- 4 files changed, 19 insertions(+), 9 deletions(-) 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(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(); -- cgit v0.12 From e20eaed5c1968e32eca97cf449fa588cfab35a5d Mon Sep 17 00:00:00 2001 From: Sami Rosendahl Date: Wed, 30 Nov 2011 20:36:56 +0100 Subject: Fix stack overwrite in QDBusDemarshaller QDBusArgument extraction operators and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. Helper function template qIterGet in qdbusdemarshaller.cpp that is used for extracting basic data types only reserves space from the stack for the expected type as specified by client. If the actual type in the DBus parameter is larger stack will be overwritten in the helper function by at most 7 bytes (expected one byte, received dbus_uint_64_t of size 8 bytes). The fix always reserves space for the largest basic type dbus_uint64_t readable by dbus_message_iter_get_basic API. See also http://dbus.freedesktop.org/doc/api/html/group__DBusMessage.html#ga41c23a05e552d0574d0444d4693d18ab PMO 280456 Task-number: QTBUG-22735 Merge-request: 1469 Reviewed-by: thiago --- src/dbus/qdbusdemarshaller.cpp | 24 +++++++- tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp | 82 ++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) 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 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/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 +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(dbusArg); + case 1: + return demarshallPrimitiveAs(dbusArg); + case 2: + return demarshallPrimitiveAs(dbusArg); + case 3: + return demarshallPrimitiveAs(dbusArg); + case 4: + return demarshallPrimitiveAs(dbusArg); + case 5: + return demarshallPrimitiveAs(dbusArg); + case 6: + return demarshallPrimitiveAs(dbusArg); + case 7: + return demarshallPrimitiveAs(dbusArg); + case 8: + return demarshallPrimitiveAs(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(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" -- cgit v0.12 From d2a3b9ee8c9329cac96b5e509df0e6a69dbef91c Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 1 Dec 2011 09:42:00 +0200 Subject: Fix def files Reviewed-by: TRUSTME --- src/s60installs/bwins/QtOpenVGu.def | 2 +- src/s60installs/eabi/QtOpenVGu.def | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s60installs/bwins/QtOpenVGu.def b/src/s60installs/bwins/QtOpenVGu.def index 547931e..dc1ddce 100644 --- a/src/s60installs/bwins/QtOpenVGu.def +++ b/src/s60installs/bwins/QtOpenVGu.def @@ -159,7 +159,7 @@ EXPORTS ?hibernate@QVGImagePool@@UAEXXZ @ 158 NONAME ; void QVGImagePool::hibernate(void) ?qt_vg_destroy_context@@YAXPAVQEglContext@@H@Z @ 159 NONAME ; void qt_vg_destroy_context(class QEglContext *, int) ??0QVGImagePool@@QAE@XZ @ 160 NONAME ; QVGImagePool::QVGImagePool(void) - ?setImagePool@QVGImagePool@@SAXPAV1@@Z @ 161 NONAME ; void QVGImagePool::setImagePool(class QVGImagePool *) + ?setImagePool@QVGImagePool@@SAXPAV1@@Z @ 161 NONAME ABSENT ; void QVGImagePool::setImagePool(class QVGImagePool *) ?pixmapLRU@QVGImagePool@@IAEPAVQVGPixmapData@@XZ @ 162 NONAME ; class QVGPixmapData * QVGImagePool::pixmapLRU(void) ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@H@Z @ 163 NONAME ; class QEglContext * qt_vg_create_context(class QPaintDevice *, int) ?reclaimImages@QVGPixmapData@@UAEXXZ @ 164 NONAME ; void QVGPixmapData::reclaimImages(void) diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def index a66df98..f87c71d 100644 --- a/src/s60installs/eabi/QtOpenVGu.def +++ b/src/s60installs/eabi/QtOpenVGu.def @@ -176,7 +176,7 @@ EXPORTS _ZN12QVGImagePool11detachImageEP13QVGPixmapData @ 175 NONAME _ZN12QVGImagePool12reclaimSpaceE13VGImageFormatllP13QVGPixmapData @ 176 NONAME _ZN12QVGImagePool12releaseImageEP13QVGPixmapDatam @ 177 NONAME - _ZN12QVGImagePool12setImagePoolEPS_ @ 178 NONAME + _ZN12QVGImagePool12setImagePoolEPS_ @ 178 NONAME ABSENT _ZN12QVGImagePool13removeFromLRUEP13QVGPixmapData @ 179 NONAME _ZN12QVGImagePool15moveToHeadOfLRUEP13QVGPixmapData @ 180 NONAME _ZN12QVGImagePool20createImageForPixmapE13VGImageFormatllmP13QVGPixmapData @ 181 NONAME -- cgit v0.12 From 1affc6720a338f59b824af1825936335e7ce1602 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 1 Dec 2011 15:01:01 +0200 Subject: Symbian: Fix CBA display on application with multiple windows If an application has more than one window and each window has widgets that can receive focus, sometimes a situation happened when the last focused window isn't actually the window that contains the current focused widget, which led to displaying incorrect CBA. Changed CBA displaying evaluation to be done whenever any control is focused instead of just windows. This can add a couple of extra S60->setRecursiveDecorationsVisibility() calls to some applications, but since that is typically already called multiple times anyway, it shouldn't be an issue. Task-number: ou1cimx1#935663 Reviewed-by: Sami Merila --- src/gui/kernel/qapplication_s60.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index ca9c3a3..c94d66d 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1548,6 +1548,7 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) || (qwidget->windowType() & Qt::Popup) == Qt::Popup) return; + QWidget *parentWindow = qwidget->window(); if (IsFocused() && IsVisible()) { if (m_symbianPopupIsOpen) { QWidget *fw = QApplication::focusWidget(); @@ -1562,11 +1563,10 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) qwidget->d_func()->setWindowIcon_sys(true); qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle()); #ifdef Q_WS_S60 - if (qwidget->isWindow()) - S60->setRecursiveDecorationsVisibility(qwidget, qwidget->windowState()); + if (parentWindow->isWindow()) + S60->setRecursiveDecorationsVisibility(parentWindow, parentWindow->windowState()); #endif } else { - QWidget *parentWindow = qwidget->window(); if (QApplication::activeWindow() == parentWindow && !hasFocusedAndVisibleChild(parentWindow)) { if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { QWidget *fw = QApplication::focusWidget(); -- cgit v0.12 From bc25cfdd65452efa226cbd544c9ae9803eb6748a Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Thu, 1 Dec 2011 14:15:00 +0100 Subject: Fix stretched font positions in Lion In Mac OS X 10.7 and up, According to http://lists.apple.com/archives/Coretext-dev/2011/Nov/msg00006.html we need to manually apply transform matrix to advances if text matrix as been applied, CTRunGetPositions won't apply it. Task-number: QTBUG-22825 Reviewed-by: Eskil --- src/gui/text/qfontengine_coretext.mm | 10 ++++++++-- src/gui/text/qfontengine_coretext_p.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm index 153451e..154c44f 100644 --- a/src/gui/text/qfontengine_coretext.mm +++ b/src/gui/text/qfontengine_coretext.mm @@ -97,6 +97,7 @@ QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const QCFString &name, const if (fontDef.stretch != 100) { transform = CGAffineTransformMakeScale(float(fontDef.stretch) / float(100), 1); } + transformAdvances = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7; QCFType descriptor = CTFontDescriptorCreateWithNameAndSize(name, fontDef.pixelSize); QCFType baseFont = CTFontCreateWithFontDescriptor(descriptor, fontDef.pixelSize, &transform); @@ -225,6 +226,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay Q_ASSERT((CTRunGetStatus(run) & kCTRunStatusRightToLeft) == rtl); CFRange stringRange = CTRunGetStringRange(run); + CGAffineTransform textMatrix = CTRunGetTextMatrix(run); int prepend = 0; #if MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_5 UniChar beginGlyph = CFStringGetCharacterAtIndex(cfstring, stringRange.location); @@ -319,9 +321,13 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay for (CFIndex i = 0; i < glyphCount - 1; ++i) { int idx = rtlOffset + rtlSign * i; outGlyphs[idx] = tmpGlyphs[i] | fontIndex; - outAdvances_x[idx] = QFixed::fromReal(tmpPoints[i + 1].x - tmpPoints[i].x); + CGSize advance = CGSizeMake(tmpPoints[i + 1].x - tmpPoints[i].x, tmpPoints[i].y - tmpPoints[i + 1].y); + if (transformAdvances) + advance = CGSizeApplyAffineTransform(advance, textMatrix); + + outAdvances_x[idx] = QFixed::fromReal(advance.width); // Use negative y advance for flipped coordinate system - outAdvances_y[idx] = QFixed::fromReal(tmpPoints[i].y - tmpPoints[i + 1].y); + outAdvances_y[idx] = QFixed::fromReal(advance.height); if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) { outAdvances_x[idx] = outAdvances_x[idx].round(); diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h index 4bd80be..495e638 100644 --- a/src/gui/text/qfontengine_coretext_p.h +++ b/src/gui/text/qfontengine_coretext_p.h @@ -146,6 +146,7 @@ private: mutable QCFType attributeDict; CGAffineTransform transform; friend class QFontDialogPrivate; + bool transformAdvances; }; CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef); -- cgit v0.12 From ecb57f4def92f8525c0a33bcf2f332fe127b2937 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 2 Dec 2011 13:14:56 +1000 Subject: Correct image paths for dynamicscene Task-number: QTBUG-22937 Reviewed-by: Chris Adams --- .../toys/dynamicscene/qml/dynamicscene/dynamicscene.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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" } } } -- cgit v0.12 From 62f9eeb0fd4ef79a6b92d4b5263122d5d3d56c09 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 2 Dec 2011 13:27:26 +1000 Subject: Fix QtDemo declarative examples The attempt to turn them into C++ examples messed them up as QML examples. Have QtDemo treat them as C++ examples for now. Task-Number: QTBUG-22983 Reviewed-By: Chris Adams --- demos/qtdemo/xml/examples.xml | 18 +++++++++--------- examples/declarative/toys/tic-tac-toe/tictactoe.pro | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) 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 @@ - - + + @@ -11,8 +11,8 @@ - - + + @@ -41,11 +41,11 @@ - - - - - + + + + + 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 -- cgit v0.12 From a6ab48bec20a746ae9bd54c1ea8a260af9967c04 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 29 Nov 2011 08:52:14 +0100 Subject: qmlplugindump: Avoid reporting types as attaching to themselves. Task-number: QTCREATORBUG-6625 Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6 Reviewed-by: Leandro Melo (backported from 409aecbe1e30aa1319ea72bf830c405827e13d21) --- tools/qmlplugindump/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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))); + } } } -- cgit v0.12 From 2cfbc2b874ebec52ee76adc60b51dca138827d8c Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 2 Dec 2011 09:30:48 +0100 Subject: qmlplugindump: Fix missing flush for objects that don't fit a line. The missing flush could result in script bindings appearing after the closing brace of an object. Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32 Reviewed-by: Leandro Melo (backported from e01219b77b1e889e70437635905d7ff820568e23) --- tools/qmlplugindump/qmlstreamwriter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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"); -- cgit v0.12 From 1c9d051399c683bf89dfd1bca54bc3c48d534087 Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 2 Dec 2011 11:44:56 +0000 Subject: Correct client rect calculation for MCL The clientRect calculation was adjusting the rectangle for the status pane. But this is now taken into account in the rectangle from Avkon, so we do not need to adjust when the status pane is there. However Avkon is supplying an inconsistent clientRect depending on whether we have all Avkon panes disabled (status pane and CBAs). When enabled, Avkon takes the splitview keyboard off the clientRect space, when disabled, Avkon ignores the splitview keyboard. Since we want to ignore the splitview keyboard effect on the clientRect, we only adjust when the Avkon panes are enabled. This has been tested with splitview keyboard, orientation change and debug output of the client rectangle returned in the following situations: - Normal app with status pane and CBA - App with CBA but invisible status pane - App with status pane and CBA disabled Task-number: ou1cimx1#938780 Reviewed-by: Miikka Heikkinen --- src/gui/kernel/qapplication_s60.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index c94d66d..587c0f2 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -273,19 +273,16 @@ void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible) TRect QS60Data::clientRect() { TRect r = static_cast(S60->appUi())->ClientRect(); - if (S60->partialKeyboardOpen) { - // Adjust client rect when splitview is open, since for some curious reason - // native side insists that clientRect starts from (0,0) even though status - // pane might be visible. + if (S60->partialKeyboardOpen && !QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)) { + // Adjust client rect when splitview is open + // We want it to take the client rect space as if the splitview keyboard was not there TRect statusPaneRect; TRect mainRect; AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStatusPane, statusPaneRect); AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainRect); int clientAreaHeight = mainRect.Height(); CEikStatusPane *const s = S60->statusPane(); - if (s && s->IsVisible()) - r.Move(0, statusPaneRect.Height()); - else + if (!(s && s->IsVisible())) clientAreaHeight += statusPaneRect.Height(); r.SetHeight(clientAreaHeight); } -- cgit v0.12 From 1f6ec34d46bc36ff9396e5e865af81cecf310cc3 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 2 Dec 2011 14:56:28 +0000 Subject: symbian - don't export qsymbianbearer.qtplugin twice The file was being exported using both prj_exports and deployment lines. As deployment is copying to epoc32 z and c directories, the prj_exports is not needed. Moved the prj_exports rules into the S60 5.0 section, where deployment is not used but rather explicit rules added to the sis file. Task-number: ou1cimx1#946574 Reviewed-by: mread --- src/s60installs/s60installs.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 08c4829..d5281f4 100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -34,9 +34,6 @@ symbian: { pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin - BLD_INF_RULES.prj_exports += \ - "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ - "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" } else { pluginLocations = $$QT_BUILD_TREE/plugins/s60 bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer @@ -54,6 +51,9 @@ symbian: { "ENDIF" \ " \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\"" qtlibraries.pkg_postrules += qts60plugindeployment + BLD_INF_RULES.prj_exports += \ + "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ + "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" } else { # No need to deploy plugins for older platform versions when building on Symbian3 or later bearer_plugin.files = $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer$${QT_LIBINFIX}.dll -- cgit v0.12 From 147ea1d18482c1f64749db52c622dded075dc66c Mon Sep 17 00:00:00 2001 From: Honglei Zhang Date: Mon, 5 Dec 2011 15:05:16 +0200 Subject: QSqlRelationalTableModel doesn't follow relations on the first column QSqlRelationalTableModel doesn't follow relations on the first column of a table. The DisplayRole and the EditRole for indexes on column 0 are always the same. The bug is found in QSqlRelationalTableModel::data. Task-number: QTBUG-20038 Reviewed-by: Charles Yin --- src/sql/models/qsqlrelationaltablemodel.cpp | 2 +- .../tst_qsqlrelationaltablemodel.cpp | 55 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 0edfaf4..c5764a7 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -430,7 +430,7 @@ QVariant QSqlRelationalTableModel::data(const QModelIndex &index, int role) cons { Q_D(const QSqlRelationalTableModel); - if (role == Qt::DisplayRole && index.column() > 0 && index.column() < d->relations.count() && + if (role == Qt::DisplayRole && index.column() >= 0 && index.column() < d->relations.count() && d->relations.value(index.column()).isValid()) { QRelation &relation = d->relations[index.column()]; if (!relation.isDictionaryInitialized()) diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 5f1a621..5ecf514 100644 --- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -93,6 +93,7 @@ private slots: void whiteSpaceInIdentifiers(); void psqlSchemaTest(); void selectAfterUpdate(); + void relationOnFirstColumn(); private: void dropTestTables( QSqlDatabase db ); @@ -1490,5 +1491,59 @@ void tst_QSqlRelationalTableModel::selectAfterUpdate() QCOMPARE(model.data(model.index(0,2)), QVariant("mrs")); } +/** + This test case verifies bug fix for QTBUG-20038. + */ +void tst_QSqlRelationalTableModel::relationOnFirstColumn() +{ + QFETCH_GLOBAL(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + + QString testTable1 = qTableName("QTBUG_20038_test1", __FILE__); + QString testTable2 = qTableName("QTBUG_20038_test2", __FILE__); + tst_Databases::safeDropTables(db, QStringList() << testTable1 << testTable2); + + //prepare test1 table + QSqlQuery q(db); + QVERIFY_SQL(q, exec("CREATE TABLE " + testTable1 + " (val1 INTEGER, id1 INTEGER PRIMARY KEY);")); + QVERIFY_SQL(q, exec("DELETE FROM " + testTable1 + ";")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(1, 10);")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(2, 20);")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(3, 30);")); + + //prepare test2 table + QVERIFY_SQL(q, exec("CREATE TABLE " + testTable2 + " (id INTEGER PRIMARY KEY, name TEXT);")); + QVERIFY_SQL(q, exec("DELETE FROM " + testTable2 + ";")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (10, 'Hervanta');")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (20, 'Keskusta');")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (30, 'Annala');")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (40, 'Tammela');")); + QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (50, 'Amuri');")); + + //set test model + QSqlRelationalTableModel model(NULL, db); + model.setTable(testTable1); + model.setRelation(0, QSqlRelation(testTable2, "id", "name")); + QVERIFY_SQL(model, select()); + + //verify the data + QCOMPARE(model.data(model.index(0, 0)), QVariant("Hervanta")); + QCOMPARE(model.data(model.index(1, 0)), QVariant("Keskusta")); + QCOMPARE(model.data(model.index(2, 0)), QVariant("Annala")); + + //modify the model data + QVERIFY_SQL(model, setData(model.index(0, 0), 40)); + QVERIFY_SQL(model, setData(model.index(1, 0), 50)); + QVERIFY_SQL(model, setData(model.index(2, 0), 30)); + + //verify the data after modificaiton + QCOMPARE(model.data(model.index(0, 0)), QVariant("Tammela")); + QCOMPARE(model.data(model.index(1, 0)), QVariant("Amuri")); + QCOMPARE(model.data(model.index(2, 0)), QVariant("Annala")); + + tst_Databases::safeDropTables(db, QStringList() << testTable1 << testTable2); +} + QTEST_MAIN(tst_QSqlRelationalTableModel) #include "tst_qsqlrelationaltablemodel.moc" -- cgit v0.12 From be08fa8280d95c2edda7e2aaee6a5211062b0090 Mon Sep 17 00:00:00 2001 From: mread Date: Mon, 5 Dec 2011 13:30:31 +0000 Subject: Symbian: allow apps to disable GL multisampling On Symbian, QML apps had no way to disable GL multisampling if the hardware supported it. This caused some apps to run out of graphics memory and fail. This change adds a way for apps to indicate that they don't want multisampling, by setting an environment variable. For example: qputenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE", "1"); This non-public API style was used as the use case is platform and application specific, and not appropriate for public API. Task-number: ou1cimx1#947771 Reviewed-by: Gareth Stockwell --- src/opengl/qgl_symbian.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp index 94c63fc..0148304 100644 --- a/src/opengl/qgl_symbian.cpp +++ b/src/opengl/qgl_symbian.cpp @@ -181,7 +181,10 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as d->ownsEglContext = true; d->eglContext->setApi(QEgl::OpenGL); - if (!QSymbianGraphicsSystemEx::hasBCM2727()) { + // Allow apps to override ability to use multisampling by setting an environment variable. Eg: + // qputenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE", "1"); + // Added to allow camera app to start with limited memory. + if (!QSymbianGraphicsSystemEx::hasBCM2727() && !qgetenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE").toInt()) { // Most likely we have hw support for multisampling // so let's enable it. d->glFormat.setSampleBuffers(1); -- cgit v0.12 From 73ee6ef3119df49c1fcc3c3478c9211379172a9a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 6 Dec 2011 14:42:51 +0100 Subject: Fix declarative examples and demos issue on Windows On Windows, if the resulting binaries reside in /Delease and /Debug subdirs. Thus we require the same hack as on Meego where the binary alone resides in the /bin subdir. Reviewed-by: Alessandro Portale --- demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 -- examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 -- 2 files changed, 4 deletions(-) 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/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; } -- cgit v0.12