summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-312927-38077/+38103
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 header.Jason McDonald2009-08-312978-38766/+38766
| | | | | | | | Reviewed-by: Trust Me
* | 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-311-1/+0
| | | | | | | | Needed due to commit 3636e666528b72de79f8c7012690bb9e279f0863
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Martin Smith2009-08-319-100/+29
|\ \
| * | 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-312-6/+12
| | | | | | | | | | | | | | | | | | 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.5' into 4.6Thiago Macieira2009-08-312-62/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
| | * Fix license headers.Jason McDonald2009-08-311-61/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Keith Isdale2009-08-313-6/+5
| | |\
| | | * Fixes: Crash when double-clicking a tab in a QTabBar with movable tabsOlivier Goffart2009-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport of commit 8ac7e81260 Reviewed-by: Peter Hartmann
| | | * Fix parsing of Subject Alternate Names in Qt.Thiago Macieira2009-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple misuse of QLatin1String. Use QString::fromLatin1 instead and avoid the QByteArray temporary. Reviewed-by: Andreas Aardal Hanssen Tracking: CVE-2009-2700
| | * | 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
| * | | 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
* | | | doc: Fixed several qdoc errors.Martin Smith2009-08-314-13/+55
|/ / /
* | | 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
* | | 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-311-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
* | | QMetaObjectPrivate: refactor internal disconnect to avoid duplicate codeLeonardo Sobral Cunha2009-08-282-49/+47
| | | | | | | | | | | | Reviewed-by: ogoffart
* | | Removing an obviously obsolete LIBS includion workaround.Alessandro Portale2009-08-281-2/+0
| | | | | | | | | | | | Reviewed-By: Trustme
* | | Mark the QSharedPointer with Qt::Uninitialized explicitThiago Macieira2009-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | That ensures we don't create ambiguities. QSharedPointer shouldn't have any implicit constructors. Suggested-By: Olivier Goffart
* | | Using QFocusFrame to visualize the focus.Alessandro Portale2009-08-283-118/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the keypad navigation, the focus state of a widget is supposed to be well visible. So it makes much sense to use QFocusFrame, which is able to paint a focus marker _around_ the widget. This change should fix the issue that with some S60 themes, the focus was invisible. Also, a lot of code is removed by this change. Task-number: 256470 Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h
* | | Don't call qFuzzyIsNull on every single frame in QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-282-3/+10
| | | | | | | | | | | | | | | We only have to do it when the opacity changes (in ::setOpacity). Also, we cannot do the cut-off when the effect has an opacity mask set.
* | | Add support for setting an opacity mask on QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-283-6/+96
| | | | | | | | | | | | | | | | | | | | | | | | Opacity masks enable you to make portions of an element transparent. More information about opacity masks here: http://msdn.microsoft.com/en-us/library/ms743320.aspx Reviewed-by: Samuel
* | | Fix wrong transform when drawing graphics item effect source.Bjørn Erik Nilsen2009-08-281-4/+2
| | | | | | | | | | | | | | | We are only interested in the difference between the original transform and the transform set on the painter we're about to use.
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2853-210/+532
|\ \ \
| * | | Make it possible for autotests to check if JIT is enabled or notKent Hansen2009-08-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Currently there are some differences in behavior and availability of information between the interpreter and the JIT. This is now documented as expected failures in the relevant autotests.
| * | | Re-enabled the QPixmap cleanup hooks in QPixmap destructor.Trond Kjernåsen2009-08-281-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| * | | Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-284-23/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget::renderText() needs to respect the current depth and scissor tests that the user has set. Therefore we needs some special casing in the GL 2 paint engine to handle the custom depth testing. The private setRenderTextActive() has been added for this purpose. Reviewed-by: Samuel
| * | | Fixed a problem where the InvertedYBindOption was always removed.Trond Kjernåsen2009-08-281-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-284-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian loader does not allow DLL import relocations in the data section. To workaround this, added an accessor function which can be used to get the class static metadata from the base class even if it is in another DLL. Changing the implementation for all platforms would cause a binary break, so it is only used for Symbian. The Q_NO_DATA_RELOCATION macro is used to configure this feature instead of Q_OS_SYMBIAN, because it is possible another platform may need the same fix and Symbian may eventually fix their DLL loader to support this feature. Task-number: 258893 Reviewed-by: Kent Hansen
| * | | doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+2
| | | |
| * | | Whitespaces & indentation cleanup in qobjectLeonardo Sobral Cunha2009-08-282-26/+27
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Fixed runtime warning in tst_QGraphicsProxyWidget::childPos.Gabriel de Dietrich2009-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ungrabKeyboard was called on an item without checking whether it was a keyboard grabber. Reviewed-by: bnilsen
| * | | Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2847-154/+344
| |\ \ \
View Lorry Controller Status