summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativexmlhttprequest.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Fix compile warnings.Friedemann Kleint2010-09-141-2/+2
| | | | | | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-9/+78
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Fix responseText to check the charset encoding field and also to notBea Lam2010-08-251-9/+78
| | | | | | | | | | | | | | | | assume that the data is xml. The change also follows the w3c spec more closely (e.g. check the mime type field as well for encoding, for both responseText and responseXML). Task-number: QTBUG-13117
* | Fixed a compile error on Mac.Denis Dzyubenko2010-08-251-3/+5
| | | | | | | | | | | | | | On some platforms/compilers QStringBuilder is not included by default, so we explicitly include it. Reviewed-by: Olivier Goffart
* | A few tiny improvements to the QDeclarativeXMLHTTPRequest.Denis Dzyubenko2010-08-241-7/+6
| | | | | | | | | | | | Just make use of the new api that was added in previous commits. Reviewed-by: Olivier Goffart
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-291-1/+2
| | | | | | | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-291-0/+4
| | | | | | | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-4/+4
|/ | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| | | | God bless QNetworkAccessManager
* Merge remote branch 'mainline/4.7' into 4.7Morten Johan Sørvig2010-05-121-0/+21
|\ | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp
| * Add QML_XHR_DUMP optionAaron Kennedy2010-05-061-0/+21
| |
* | QtDeclarative: remove spurious semi-colons from the source codeThiago Macieira2010-05-041-3/+3
|/
* Emit runtime warnings through QDeclarativeEngineAaron Kennedy2010-04-191-1/+1
| | | | QTBUG-9726
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-5/+5
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Technically, Location can be relative (never is though...)Warwick Allison2010-03-101-1/+1
|
* Don't assume documents are in UTF-8.Bea Lam2010-03-051-3/+16
| | | | Task-number: QTBUG-7719
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+1631
QDeclarativeXXX.
generated by cgit v0.12 at 2025-04-28 04:02:41 (GMT)