summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-102-3/+2
|\
| * Xml patterns: remove line in .pro file that added the schematron dirPeter Hartmann2009-08-101-1/+0
| | | | | | | | | | | | | | this line was dragged in from the Xml schema branch, but there is no schematron in Qt. Reviewed-by: TrustMe
| * In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
* | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-066-6/+6
| | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | Merge commit 'origin/master'Jason Barron2009-08-046-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-036-6/+6
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-043-1/+25
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Don't process input events while waiting for network response.Martin Jones2009-07-311-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 4b84041c072325bd09bb7177d121330048133103) Reviewed-by: mbm
| * | Port of Qt to VxWorksRobert Griebl2009-07-292-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-1/+2
|\ \ \ | |/ /
| * | Fixes: Compile on winscwHenrik Hartz2009-07-281-1/+2
| | | | | | | | | | | | | | | | | | RevBy: Frans Englich Details: QHash::value creates an internal compiler error in this case on Metrowerks, using find instead
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-27222-597/+38574
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * Build with rvct compiler.Martin Jones2009-07-232-2/+3
| | | | | | | | Reviewed-by: akennedy
| * Fix compilation with xlC 7: the compiler tries to expand ↵Thiago Macieira2009-07-212-14/+14
| | | | | | | | | | | | | | | | | | qIsForwardIteratorEnd with QString This is used in other places too, so move the definition to the header. Reviewed-By: Trust Me
| * Fix compilation with xlC 7: the compiler doesn't find statics in template ↵Thiago Macieira2009-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | expansions. parser/qmaintainingreader.cpp", line 175.40: 1540-0274 (S) The name lookup for "formatKeyword" did not find a declaration. parser/qmaintainingreader.cpp", line 175.40: 1540-1292 (I) Static declarations are not considered for a function call if the function is not qualified. Reviewed-By: Peter Hartmann Reviewed-By: Frans Englich
| * Fix compilation of QHash<QUrl, ...> with xlC 7.Thiago Macieira2009-07-211-11/+13
| | | | | | | | | | | | | | Make sure that the function is found properly. It can't be static, for whatever reason. Reviewed-By: Peter Hartmann
| * Compile fix with namespaced Qthjk2009-07-213-0/+12
| |
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * Fix assert in message handling.Frans Englich2009-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Trivial fix. Reported by Michael Brasser. Task-number: 258337 Reviewed-By: Peter Hartmann
| * | Xml Schema: license header updatePeter Hartmann2009-07-2055-55/+55
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-5/+5
| | |
| * | Fix (some) spelling and grammatical errors in translatable strings.Volker Hilsheimer2009-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Requires an update of existing translations. Fixes: 247314 Reviewed-by: TrustMe
| * | XmlSchema: update license headersPeter Hartmann2009-07-163-12/+12
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | XmlSchema: add license headers for some filesPeter Hartmann2009-07-164-0/+131
| | | | | | | | | | | | | | | | | | some files did not contain the proper license headers. Reviewed-by: TrustMe
| * | Update the license headers in XML Schema to the new formatThiago Macieira2009-07-16109-109/+109
| | |
| * | Xml Schema: move license file to the right directoryPeter Hartmann2009-07-151-0/+0
| | | | | | | | | | | | | | | | | | move the license file for the xml.xsd schema file Reviewed-by: TrustMe
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-151-1/+1
| |\ \
| | * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Add W3C license text for xml.xsdTobias Koenig2009-07-131-0/+40
| | | |
| * | | Revert "Remove builtin xml schema file until legal issues are clarified"Tobias Koenig2009-07-132-0/+146
| | | | | | | | | | | | | | | | This reverts commit 3ded2e1ea5a74a6fc0d3938fa732f886aa275ca2.
| * | | Remove builtin xml schema file until legal issues are clarifiedTobias Koenig2009-07-102-146/+0
| | | |
| * | | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-05603-1212/+1232
| |\ \ \ | | |/ /
| * | | Merge commit 'qt-mainline/master'Tobias Koenig2009-06-047-13/+13
| |\ \ \
| * | | | Fixed typo in apidocs and extended example codeTobias Koenig2009-06-032-3/+14
| | | | |
| * | | | Add conformance section to qtxmlpatterns doc and extended api docsTobias Koenig2009-05-311-1/+7
| | | | |
| * | | | Added code snippets for QXmlSchemaValidator and referenced them from api docsTobias Koenig2009-05-211-0/+12
| | | | |
| * | | | Added code snippets for QXmlSchema and referenced them from api docsTobias Koenig2009-05-211-0/+16
| | | | |
| * | | | Complete documentation of schema example and reference it from api docsTobias Koenig2009-05-202-0/+4
| | | | |
| * | | | First version of documentation for schema exampleTobias Koenig2009-05-191-0/+10
| | | | |
| * | | | Forward errors from QXmlStreamReader to XsdSchemaParserTobias Koenig2009-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | (missed this commit on the first merge, autotest works again)
| * | | | Remove unneeded qDebug statementTobias Koenig2009-05-191-1/+0
| | | | |
| * | | | Adapt license headers to LGPLTobias Koenig2009-05-16109-218/+3488
| | | | |
| * | | | Various api, documentation and code cleanupsTobias Koenig2009-05-1625-105/+213
| | | | |
| * | | | Add W3C XML Schema validation supportTobias Koenig2009-05-16213-561/+34912
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by Tobias Koenig, as part of an internship at Trolltech/Qt Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work consisting of about 650 commits squashed into one, where the first commit was 61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history cut.
* | | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30603-1212/+1232
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | | QXmlQuery: add setFocus(const QString &).Frans Englich2009-06-292-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by Girish and Jurgen. Useful for training and small examples. Task-number: 245219 Reviewed-by: Tobias Koenig AutoTest: Included in this submit.
| * | | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16603-1212/+1212
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16603-1212/+1212
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-255-11/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | | improved string operations all over the placeThierry Bastian2009-05-285-11/+11
| |/ / | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
generated by cgit v0.12 at 2024-11-22 19:15:10 (GMT)