summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311019-13221/+13223
| | | | Reviewed-by: Trust Me
* doc: Fixed several qdoc errors.Martin Smith2009-08-311-12/+48
|
* Fixed custom shader example to correctly use premultiplied colors.Samuel Rødal2009-08-311-1/+1
| | | | Reviewed-by: Gunnar
* Fixed performance issue with graphics effects on graphics items.Samuel Rødal2009-08-311-0/+2
| | | | | | | Prevent a deep copy of the pixmap by ending the painter before returning the pixmap. Reviewed-by: Bjørn Erik Nilsen
* Fixed inverted pixmaps when using OpenGL graphics effects.Samuel Rødal2009-08-311-1/+3
| | | | | | | QGL2PaintEngineExPrivate::drawTexture() texture coordinates have been inverted, so they need to be inverted here too. Reviewed-by: Kim
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-317627-99675/+100917
|\
| * Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-08-312-4/+7
| |\
| | * Find the cached bounds only when necessary.Ariya Hidayat2009-08-312-4/+7
| | | | | | | | | | | | | | | | | | | | | We delay computing the bounding rect as late as possible. This speeds-up QSvgPath construction. Reviewed-by: Kim
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-317611-99495/+99482
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| | * Update tech preview license and LGPL Exception.Jason McDonald2009-08-312-407/+411
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update tech preview license header.Jason McDonald2009-08-317707-100428/+100383
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Add license headersPaul Olav Tvete2009-08-313-0/+123
| | | | | | | | | | | | Reviewed-by: trustme
| * | Fix QSslCertificate::alternateSubjectNames() memory leakRaul Metsma2009-08-313-1/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: 258964 Merge-request: 1382 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * | Preemptively parse the necessary attributes in QSvgAttributes.Ariya Hidayat2009-08-311-57/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, retrieving an attribute value requires a two-stage lookup, first in the XML attributes and (if it is found there) in the CSS attributes. Both look-ups requires a number of iterations and comparisons, which have to be carried out for every value look-up. This patch changes it so that iterations and comparisons need to be done only once, namely at the beginning. This requires us to store several SVG attributes needed by the parsing routine, but since they are just QStringRefs, the increase in the heap usage is really minimal and even not reported by Valgrind's Massif. Also, now we don't need to hold the XML attributes anymore. The loading of tiger.svg (tests/benchmarks/qsvgrenderer) is reduced from 101.2 millions instructions to 96.5. The biggest gain is however obvious from the time spent in QSvgAttributes::parseStyle(QSvgNode*, QSvgAttributes, QSvgHandler*) which goes down from 16.7 millions instructions to 6.9 millions, i.e. 2.4x faster. Even with the new extra overhead in the QSvgAttributes constructor, QSvgAttributes::parseStyle(QSvgNode*, QXmlStreamAttributes, QSvgHandler*) goes down from 23.5 millions instructions to 18.4 millions, i.e. 1.3x faster. Reviewed-by: Kim
| * | fix crash due to double deletionKent Hansen2009-08-312-1/+22
| | | | | | | | | | | | Needed due to commit 3636e666528b72de79f8c7012690bb9e279f0863
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Martin Smith2009-08-3127-180/+1146
| |\ \
| | * | don't disable the JIT for qtscriptKent Hansen2009-08-311-2/+0
| | | | | | | | | | | | | | | | AKA, enable it on platforms where it's supported.
| | * | make sure hasInstance() is always invoked for custom script objectsKent Hansen2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to specify the OverridesHasInstance flag, otherwise the JIT will do the standard hasInstance implementation instead of calling our virtual function. This makes the QScriptClass::extension() autotest pass.
| | * | implement functionExit() callbacks on the JITKent Hansen2009-08-313-20/+42
| | | | | | | | | | | | | | | | | | | | | | | | The return value is not reported (we need a separate callback for that, just like in the interpreter), but that isn't important to get our tools (i.e. the debugger) working.
| | * | No need for the namespaced version in QSvgAttributes::value().Ariya Hidayat2009-08-311-18/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not really use this function with proper namespace URI, so let us get rid of the function. Reviewed-by: Kim
| | * | Merge branch '4.6'Thiago Macieira2009-08-3136-242/+1259
| | |\ \
| | | * \ Merge branch '4.5' into 4.6Thiago Macieira2009-08-318-103/+177
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
| | | | * Autotest: add some D-Bus tests sending complex structs and lists of themThiago Macieira2009-08-312-0/+53
| | | | |
| | | | * Fix license headers.Jason McDonald2009-08-315-102/+123
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Keith Isdale2009-08-31694-3089/+24515
| | | | |\
| | | | * | Correct grammatical in documentation for QNetworkDiskCache::expire()Keith Isdale2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text: When the current size of the cache is greater then the maximumCacheSize() should read When the current size of the cache is greater than the maximumCacheSize() Task-number: 260496 Reviewed-by: Zheng Liu (George)
| | | * | | Add an opt-in QWeakPointer::operator->.Thiago Macieira2009-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use this, you must add #define QWEAKPOINTER_ENABLE_ARROW to your .cpp before #including any headers. Be careful about adding this to .h files. Reviewed-by: Olivier Goffart
| | | * | | Benchmark test for QSvgRenderer.Ariya Hidayat2009-08-314-0/+848
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now mostly testing the constructor and the parser. The only SVG to be tested so far is tiger.svg, i.e. the famous Tiger head converted from tiger.eps found in GPL-ed Ghostscript. Reviewed-by: Kim
| | * | | | Update the qmake autotest: re MSVC test failure findMocs and findDepsKeith Isdale2009-08-312-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MSVC is used the default DESTDIR makes use a release/debug suffix. For these tests DESTDIR needs to be "."/ Minor code cleanup was done whilst correcting these effected .pro files Reviewed-by: Lincoln Ramsay
| * | | | | doc: Fixed several qdoc errors.Martin Smith2009-08-314-13/+55
| | | | | |
* | | | | | Install only the required S60 SDK version specific plugin to the HW.Janne Anttila2009-08-311-11/+19
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake has been lately expanded with pkg_prerules / pkg_postrules support which make it possible to customize .pkg file content via pro file. In addition we have got template package file support which takes care of expanding TARGET and PLATFORM variables from .pkg files before creating .sis file. With help of these features and since .pkg format supports conditional install statements, we can now install only the S60 version specific plugin to each HW. This saves disk usage a bit. Task-number: 248061 Reviewed-by: Miikka Heikkinen
* | | | | Merge branch 'master' into 4.6Janne Anttila2009-08-314-14/+58
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Anttila2009-08-281-1/+1
| |\ \ \ \ \
| * | | | | | Updated docs to reflect current 'createpackage' and 'make sisx' syntax.Janne Anttila2009-08-284-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
* | | | | | | Fixed createpackage to use lowercase target to be Linux compliant.Janne Anttila2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All S60 SDK paths in Linux are lowercase. Reviewed-by: TrustMe
* | | | | | | Trivial change to comment.Janne Anttila2009-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | | | Removed hard-coded sqlite3 deployment statement - used PKG conditions.Janne Anttila2009-08-311-11/+7
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change Qt did not install to device which had sqlite3 already in ROM. Since we now install the sqlite3 only if it is not on any drive, the installation works also with preinstalled sqlite. Even better appraoch would be to use embedded SIS file for sqlite, since that would allow sqlite3 upgrade without upgrading the whole Qt. However we yet don't have such SIS, but once we get one from Symbian this needs to be further changed. Task-number: 258858 Reviewed-by: Miikka Heikkinen
* | | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-312-6/+19
|\ \ \ \ \ \
| * | | | | | Fixes compile for my last change.Bill King2009-08-311-1/+1
| | | | | | |
| * | | | | | Adds ability to open sqlite databases readonly.Bill King2009-08-312-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes opening of sqlite to open_v2, and adds a new connection option. Reviewed-by: Justin McPherson
* | | | | | | Added QContextMenuEvent sending to widget in Symbian.Janne Anttila2009-08-311-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event construction without sending does nothing, sending constructed event possibly dissappeared due to bad merge or something. So here it comes again... Task-number: 260222 Reviewed-by: TrustMe
* | | | | | Added doc link to point to Assistant doc table of collection file values.Peter Yard2009-08-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fix for task 259252.
* | | | | | Move QGLShareContextScope to qgl_p.h so other things can use it.Rhys Weatherley2009-08-312-37/+40
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-08-311-11/+11
|\ \ \ \ \ \
| * | | | | | Fixes race condition on reopening an ODBC connection.Bill King2009-08-311-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original code was keeping it's own (out of date) copy of the handles. It now includes a pointer to the driver private, and asks that what the handles are instead.
* | | | | | | Remove QGLShader from its QGLShaderProgram when it is destroyedRhys Weatherley2009-08-312-4/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | | | Destroy EGL window surface when direct VG surface is deletedRhys Weatherley2009-08-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenVG window surfaces were leaking because the QVGEGLWindowSurfaceDirect destructor was previously not cleaning up the EGLSurface object. Reviewed-by: trustme
* | | | | | trivial: make moc compile againHarald Fernengel2009-08-281-0/+2
| | | | | |
* | | | | | Warning --Alessandro Portale2009-08-281-0/+2
| | | | | |
* | | | | | Added a default theme for the simulated S60 styleAlessandro Portale2009-08-284-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme
generated by cgit v0.12 at 2024-09-23 12:15:01 (GMT)