summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation on AIX: -I/usr/include cannot be used.Thiago Macieira2009-07-301-9/+3
| | | | | | | | | | | | The reason is that the C++ compiler needs to add -I/usr/vacpp/include before -I/usr/include, so our adding of -I/usr/include changes the order. This causes a compilation error in the C++ header xlocinfo.h. In any case, these checks done in qmake are unnecessary. If the OpenSSL headers are in one of those include paths, they will be found on their own already. Reviewed-By: Bradley T. Hughes
* Revert "Avoids comparing a pointer (d->layout) after deleted in qgraphicswidget"Leonardo Sobral Cunha2009-07-301-1/+1
| | | | | | | This reverts commit e181f8754bccb13cb59212f279e05c20cb76db62. This code is used for compatibility issues for custom layouts that dont delete their children, so its a false positive from coverity.
* Avoids comparing a pointer (d->layout) after deleted in qgraphicswidgetLeonardo Sobral Cunha2009-07-301-1/+1
| | | | Reviewed-by: ogoffart
* fix two bugs in the custom script class exampleKent Hansen2009-07-302-3/+10
| | | | | | | | | 1) fromScriptValue() needs to call qvariant_cast() on the data, in order to be symmetric with toScriptValue(). 2) use the overload of newFunction() that takes a prototype object, so that the prototype.constructor and constructor.prototype relationship is set up correctly; otherwise the instanceof operator won't work.
* Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-3016-142/+586
|\
| * Fix build on Solaris x86 with old Mesa glx headersTom Cooksey2009-07-291-5/+8
| |
| * Support EGL_NOKIA_texture_from_pixmap on HarmattanTom Cooksey2009-07-291-8/+163
| | | | | | | | | | Added QGLContextPrivate::bindTextureFromNativePixmap() implementation for X11/EGL.
| * Add a getter to QEglContext for the EGL extension stringTom Cooksey2009-07-292-0/+14
| | | | | | | | Reviewed-By: Rhys Weatherley
| * Refactor texture_from_pixmap to not re-create the gl surface each bindTom Cooksey2009-07-295-88/+152
| | | | | | | | | | | | | | | | Make a clear seperation between the GL texture and the GLX pixmap. A GLXPixmap is valid in any GL context and thus does not need to be re-created every time the pixmap has changed. Reviewed-By: Samuel
| * Move uninit & readonly into a flags member of QX11PixmapDataTom Cooksey2009-07-294-18/+25
| | | | | | | | | | | | | | Also add 2 new flags and a new member to store any GL bound pixmap surface (GLXPixmap or EGLPixmapSurface). Reviewed-By: Samuel
| * Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-288-37/+238
| | | | | | | | | | | | | | The new class alows more than one hook to be installed at a time and, for QPixmaps, the hook is told which pixmap is getting deleted. Reviewed-By: Samuel
* | parse Q_INVOKABLE explicit constructorsOlivier Goffart2009-07-302-1/+8
| | | | | | | | | | | | | | regression introduced in e43eae35 because the code of maybeParseFunction and parseFunction is not exactly the same. Reviewed-by: Kent Hansen
* | Start implementing Mac accessibility for cocoa.Morten Sørvig2009-07-302-1/+236
| | | | | | | | | | | | | | | | | | | | Rather than having this stuck in a branch somewhere I'm going to implement it incrementally in main. It's going to be a long haul before it's done. This commit implements: - accessibilityIsIgnored() - Accessibility role translation
* | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qtAaron Kennedy2009-07-301621-22791/+50777
|\ \
| * | Convert all testlib loggers to use dynamically allocated strings.Rohan McGovern2009-07-304-132/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most log elements in all loggers can now be of (more or less) arbitrary length. Selftests pass and are memcheck-clean. The increase in heap usage seems negligible (it's below the default minimum threshold of massif). Task: 253861 Reviewed-by: Michael Goddard
| * | Make QTestBasicStreamer use dynamically allocated strings.Rohan McGovern2009-07-3010-102/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains the bare minimum needed for the API to use dynamic allocation; some parts of the code still use static buffers and therefore have constraints on the size of output messages. Task: 253861 Reviewed-by: Michael Goddard
| * | Allow testlib loggers to dynamically allocate storage for strings.Rohan McGovern2009-07-3010-10/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables very long failure messages (e.g. including an entire build log in a failure message). This change modifies only the plain test logger to use this feature. Task: 253861 Reviewed-by: Michael Goddard
| * | Unit tests and bug fixes for QGLColormapRhys Weatherley2009-07-302-7/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLColormap::setEntry() was inserting entries instead of replacing them; QGLColormap::setEntries() had an incorrect assert and weird behaviour for the "base". The documentation for QGLColormap::isEmpty() has been updated to reflect that it will also report empty if the colormap has not been set on a QGLWidget even if it has entries in it. This behaviour is required by existing code. Reviewed-by: Rohan McGovern
| * | Increase coverage of QGLFormat unit tests.Rhys Weatherley2009-07-301-19/+190
| | | | | | | | | | | | Reviewed-by: trustme
| * | qdoc fix: stencil buffer is enabled by default, not disabledRhys Weatherley2009-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | Stencil buffer has been enabled by default for quite some time (2 years) but the documentation was still saying disabled. Reviewed-by: bnilsen
| * | Add math3d unit tests for QObject properties and metatypesRhys Weatherley2009-07-293-0/+195
| | | | | | | | | | | | Reviewed-by: trustme
| * | Doc: Another classlist.Volker Hilsheimer2009-07-292-54/+14
| | |
| * | Doc: Move legalese files into a separate directory.Volker Hilsheimer2009-07-298-12/+13
| | |
| * | Doc cleanup: Move list-generating pages together into classes.qdocVolker Hilsheimer2009-07-297-299/+72
| | |
| * | Fix compilation and source compatibility.Simon Hausmann2009-07-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Source code that includes <QNetworkCookieJar> implicitly includes QNetworkCookie in Qt 4.5. Restore this and keep Qt compiling after the split up by including qnetworkcookie.h from qnetworkcookiejar.h Reviewed-by: Trust me
| * | Doc: remove obsolete content.Volker Hilsheimer2009-07-291-12/+0
| | |
| * | Remove old and obsolete files.Volker Hilsheimer2009-07-294-110/+0
| | |
| * | Doc: Fix incorrect merge.Volker Hilsheimer2009-07-291-3/+0
| | |
| * | Doc: The layout documentation is not a list of classes.Volker Hilsheimer2009-07-299-16/+15
| | |
| * | Fix compilation: #include <QUrl> was missing.Thiago Macieira2009-07-291-0/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtkh2009-07-291714-25490/+51747
| |\ \
| | * | Autotest: fix the regressions in the DOM test caused by one whitespaceThiago Macieira2009-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | being removed. Reviewed-by: Volker Hilsheimer
| | * | test that vars are stored in custom global objectKent Hansen2009-07-291-0/+29
| | | |
| | * | QNAM HTTP Code: Split QHttpNetworkConnectionMarkus Goetz2009-07-295-75/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor our the Channel object to a new file. My goal is to make QHttpNetworkConnection more maintainable before implementing HTTP pipelining. Reviewed-by: Peter Hartmann
| | * | Use correct license header.Volker Hilsheimer2009-07-292-4/+4
| | | |
| | * | Xml Schema: document the xmlpatternsvalidator command line utilityPeter Hartmann2009-07-291-0/+6
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | compile on QNXHarald Fernengel2009-07-291-1/+2
| | | |
| | * | Optimized single-rect clip case in OpenGL 2 paint engine.Samuel Rødal2009-07-292-17/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use scissor based clipping when only dealing with rectangular intersect clips. As soon as we get any more complex clips (or unite/replace clips) we fall back to depth buffer based clipping. Task-number: 258748 Reviewed-by: Tom
| | * | Add XML schema example to qtdemoPeter Hartmann2009-07-291-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Frans Englich
| | * | Compile after API renameVolker Hilsheimer2009-07-291-1/+1
| | | |
| | * | Doc: fix links to the examplesVolker Hilsheimer2009-07-291-2/+3
| | | |
| | * | Fix copy/paste typoVolker Hilsheimer2009-07-291-1/+1
| | | |
| | * | Doc: Documentation for new toString(QVariant) overloadVolker Hilsheimer2009-07-291-0/+7
| | | |
| | * | Doc: Document QGraphicsObject::children workaround as \internalVolker Hilsheimer2009-07-291-0/+10
| | | |
| | * | Autotest: make tst_qdom work with shadow builds too.Thiago Macieira2009-07-292-23/+27
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | Remove "no-stl" from the build key and add compatibility for old plugins.Thiago Macieira2009-07-294-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STL support hasn't had binary compatibility effects for the entire lifetime of Qt 4, so it should never have been there. It is a legacy thing I am now correcting. When inspecting a plugin, remove the "no-stl" from its loaded build key. That indicates a pre-4.6 build, since now Qt no longer adds it to its own build keys. Note that you have to remove the 4.6 plugin cache from $HOME/.config/Trolltech.conf or the registry for this change to work (if you compile Qt with -no-stl). Otherwise, plugins that have already been scanned will fail to load. Reviewed-by: Bradley T. Hughes
| | * | Update the changelog about the STL test being stricter.Thiago Macieira2009-07-291-0/+14
| | | | | | | | | | | | | | | | Referring to change f120b5e4b63cbc30874fa21947b75d352f18d7df.
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason Barron2009-07-2910-279/+469
| | |\ \
| | | * | qdoc: Added -obsoletelinks flag to opt in for reporting obsolete links.Martin Smith2009-07-294-5/+18
| | | | |
| | | * | Move the QNetworkCookieJar class out of qnetworkcookie.[h,cpp] files and ↵Benjamin C Meyer2009-07-296-274/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qnetworkcookiejar[h,_p.h,cpp]. one adjustment was necessary from the merge request: The line 110 in qnetworkcookie.h needed to include qnetworkcookiejar.h, not <QtNetwork/QNetworkCookieJar> . Merge-request: 1015 Reviewed-by: Peter Hartmann