summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-272313-42657/+93038
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * repair showSummary after commit 08b3511a0cJoerg Bornemann2009-07-231-1/+3
| | | | | | | | Reviewed-by: thartman
| * Qt/EL mouse and keyboard driver cleanup.Robert Griebl2009-07-2338-2903/+257
| | | | | | | | | | | | | | | | | | * removed the vr41xx, yopy and sl5000 drivers (old PDAs) * removed the bus mouse driver (ISA days should be over) * renamed the LinuxIS mouse driver to LinuxInput (consistency with the key driver) * unified the LinuxInput mouse and key driver I/O handling Reviewed-By: Paul
| * Fixed embedded mouse and keyboard docu for 4.6Robert Griebl2009-07-235-26/+139
| | | | | | | | Reviewed-By: Paul
| * Finish up my AA_DontSwapMetaAndControl feature.Norwegian Rock Cat2009-07-231-1/+3
| | | | | | | | | | | | | | | | Ugh. The whole reason I added this was so that the text() would be preserved for people that did stuff with Control. Somehow in all the other fixes I did, I forgot to actually do that part. Reviewed-by: Denis
| * Doc: link to bugreport form and the public repositoryVolker Hilsheimer2009-07-232-8/+10
| |
| * Fix time change detection on UNIX systems without monotonic timersBradley T. Hughes2009-07-232-42/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few fixes in one: 1. Don't loop on select() when not using monotonic timers... when select returns, the time may have changed, and the offset calculated in the loop may be very wrong on the next iteration. 2. Calculate the elapsed time deltas using timevals instead of integers using milliseconds. This handles changing the time by more than a few hours or days (i.e. months and years) without overflow. 3. When repairing the timers, the diff is already the correct sign, so we should just add the diff. Task-number: 250681 Reviewed-by: Thiago
| * qdoc: Removed obsolete classes from annotated lists.Martin Smith2009-07-231-0/+3
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-07-231-0/+2
| |\
| | * Socket code: Forgot since 4.6 doc tagMarkus Goetz2009-07-231-0/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Doc: Fixed qdoc warningsDavid Boddie2009-07-232-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Removed invalid statements about item views and QTextDocument.David Boddie2009-07-231-2/+2
| |/ | | | | | | | | | | Task-number: 257669 Reviewed-by: Trust Me Bikeshed-value-for-reviewed-by-field: 11
| * Fix two errors of QDirIteratorPrivate::matchesFilters()Benjamin Poulain2009-07-231-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | The filter for includeSystem was exectuted twice. The second time was not correct according to d9a620633d0a5fa5e69ab06ec9a706118f3df2a6 (QFileInfo::exists() can return false for system file). For skipDirs, a parenthesis was missing in the test of includeHidden and includeSystem. This was introduced in the refactoring of 44766d265c16551043d2739171069fe042c40091 Reviewed-by: João Abecasis
| * doc: Removed a few links to obsolete functions (not controversial).Martin Smith2009-07-231-16/+11
| |
| * Omit monotonic timer detection/conditional code on Mac OS XBradley T. Hughes2009-07-232-18/+14
| | | | | | | | | | | | | | | | Now that we have a monotonic time source on the Mac, we don't need to compile in the code to detect wall-time changes and do timer adjustments. Reviewed-by: nrc
| * "Emacs" style keyboard shortcuts don't work on Carbon.Prasanth Ullattil2009-07-231-2/+2
| | | | | | | | | | | | | | | | | | Set the native key equivalent for menu items only for single key shortcuts. Qt's shortcut mechanism will take care of sending the multiple key shortcut events. Task-number: 258438 Reviewed-by: Norwegian Rock Cat
| * make statemachine compile with QT_NO_PROPERTIESKent Hansen2009-07-234-0/+22
| |
| * linker fix for WinCEMaurice Kalinowski2009-07-237-5/+14
| | | | | | | | | | | | | | | | - link against correct library - theoretically it should be ok to use QHostInfo::localHostName(), but for this test it is fine Reviewed-by: Thomas Hartmann
| * QNAM HTTP Code: Use new LowDelay socket optionMarkus Goetz2009-07-231-0/+5
| | | | | | | | Reviewed-by: Thiago
| * tst_qnetworkreply: Small and simple latency testingMarkus Goetz2009-07-233-0/+88
| | | | | | | | Reviewed-by: Thiago
| * QFtp: Also set LowDelay option on the control socketMarkus Goetz2009-07-231-0/+3
| | | | | | | | Reviewed-by: Thiago
| * Sockets: Added support for SO_KEEPALIVE and TCP_NODELAYMarkus Goetz2009-07-238-10/+154
| | | | | | | | | | | | | | | | Introduce QAbstractSocket::setSocketOption that allows to set the socket options for TCP Keep Alive and TCP_NODELAY (disabling Nagle's Algorithm). Reviewed-by: Thiago
| * "Emacs" style keyboard shortcuts don't work on Cocoa.Prasanth Ullattil2009-07-232-3/+12
| | | | | | | | | | | | | | | | | | Mac supports only single key shortcuts as key equivalent for menu items. So if a multiple key QKeySequence is set, use Qt's shortcut mechanism instead of the native menu shortcut mechanism. Task-number: 258438 Reviewed-by: Norwegian Rock Cat
| * Ensure all the standard shorcuts are used for the Close Action in MDIAndy Shaw2009-07-231-1/+1
| | | | | | | | | | | | | | | | Since there is more than one standard shorcut for closing a MDI window, then ensure that all of them can be used. Task-number: 161999 Reviewed-by: Simon Hausmann
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAndy Shaw2009-07-231-1/+1
| |\
| | * Fix build on HarmattanTom Cooksey2009-07-231-1/+1
| | | | | | | | | | | | Reviewed-By: Trustme
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAndy Shaw2009-07-238-52/+266
| |\ \ | | |/
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMartin Jones2009-07-237-50/+282
| | |\
| | | * Fix merge error, restore size of bit field.Andreas Aardal Hanssen2009-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 34fde4a4 removes one bit from the flags bitfield, which was added in change 7bc98d7b. This happened during resolving of a merge conflict and caused some input method related autotests in tst_QGraphicsView to fail. Reviewed-by: mbm
| | | * Add QGraphicsItem::focusProxy(), focus proxy support.Andreas Aardal Hanssen2009-07-236-48/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following QWidget's behavior, you can not assign any item in the same scene as a focus proxy for another item. Also supports nested focus proxies. You can only assign items in the same scene as focus proxies. Autotests are included. Reviewed-By: mbm
| | * | Build with rvct compiler.Martin Jones2009-07-232-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: akennedy
| * | | Remove the close shortcut from the example since QMdiArea provides thisAndy Shaw2009-07-231-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Since QMdiArea provides this already via the standard keys, then we don't want to add it ourselves otherwise it triggers an ambigious shortcut on the platforms which already has CTRL+F4. Task-number: 161999 Reviewed-by: Kavindra Palaraja
| * | Add texture_from_pixmap defines for systems without themTom Cooksey2009-07-231-0/+19
| |/ | | | | | | | | | | | | This fixes the build on older Solaris machines which don't have the GLX_EXT_texture_from_pixmap defines in glxext.h. Reviewed-By: Trustme
| * Add the math3d types to QVariantRhys Weatherley2009-07-2315-28/+452
| | | | | | | | Reviewed-by: Sarah Smith
| * Compile in release mode for DFB version > 0.9Anders Bakken2009-07-221-1/+6
| | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe
| * CompileAnders Bakken2009-07-221-1/+2
| | | | | | | | | | | | | | | | | | The dummy implementaion of QReadWriteLock wasn't source compatible with the real implementation and this lead to compilation errors in qabstractfileengine.cpp which now has a global static QReadWriteLock that takes a Recursive argument. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Doc - Clarified that Graphics View does not support the inverted y-axisKavindra Devi Palaraja2009-07-221-0/+3
| | | | | | | | | | | | | | | | coordinate system Task: 258259 Reviewed-By: João Abecasis <joao@trolltech.com>
| * Fix potential deadlock in QAbstractFileEngineJoão Abecasis2009-07-221-10/+12
| | | | | | | | | | | | | | | | | | | | There's a possibility for deadlocking with user code in QAbstractFileEngine. Changing the QMutex there to a QReadWriteLock should reduce the possibilities for this happening. Also reduced the scope of the lock in QAbstractFileEngine. Reviewed-by: Thiago Macieira
| * Fix build on MacTom Cooksey2009-07-222-8/+28
| | | | | | | | | | | | | | | | | | The texture_from_pixmap patch removed a bindTexture overload from QGLContextPrivate which is actually needed by all architectures. It was just it's use in the mac compat methods which broke the build and highlighted the issue. Reviewed-By: Trustme
| * Plug a texture leak when deleting QPixmaps without a current contextTom Cooksey2009-07-222-16/+9
| | | | | | | | | | | | | | | | | | ~QGLTexture wouldn't make the texture's context current if the current context was zero, meaning the texture would leak. This also means deleteBoundPixmap doesn't need to make the context currnet anymore (as it's only called from ~QGLTexture). Reviewed-By: Kim
| * Fix autotest compile failureJens Bache-Wiig2009-07-221-2/+2
| |
| * fix linker error for the cetest toolJoerg Bornemann2009-07-221-1/+2
| | | | | | | | Reviewed-by: TrustMe
| * QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2221-17/+348
| | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
| * Merge branch '4.5'Thiago Macieira2009-07-225-56/+40
| |\
| | * Fix handling of invalid object paths and signatures in release mode.Thiago Macieira2009-07-221-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had this #ifdef __OPTIMIZE__ there so that the compiler would know not to generate unnecessary calls and a long jump table for the switch of the marshalling code. Turns out that in release mode, the checks I added to make sure we detect invalid object paths and signatures were never hit (we always treated them as pure strings). So use the signature- and object path-checking code in both release and debug mode. Task-number: reported via email (tst_qdbusmarshall failing) Reviewed-by: Peter Hartmann
| | * Revert "Added a check that X11 timestamp goes forward only."Denis Dzyubenko2009-07-221-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases we might get an invalid timestamp that is far away in the future, so remembering it will break all consequent X calls that require a timestamp because it just contains junk (for example clipboard will stop working). This happens with XIM+SCIM pair - whenever we start input method and type something to the widget, we get a XKeyPress event with a commited string, however the 'serial' and 'time' members of the XEvent structure are not initialized (according to valgrind) and contain junk. This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. Reviewed-By: Brad
| | * QSslSocket autotest: adapt to new certificate on test serverPeter Hartmann2009-07-222-23/+16
| | | | | | | | | | | | | | | | | | got a new certificate, which is self-signed now Reviewed-by: Thiago
| | * Fix table borders in multiline tables when printing to PostScript.Gunnar Sletta2009-07-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not all to happy with this fix, but its the best that one can acheive given the current design. The problem is that QPdfBaseEngine sets a number of states as part of updateState(), but only when we are playing back through the alpha engine. These states are used in some draw functions, also when we are recording in the alpha engine. This leads to the states and their checks being out of sync. So to follow the existing pattern in the code we need to not touch d-> vars prior to a check to usesAlphaEngine. Reviewed-By: Eskil
| * | Use texture_from_pixmap on X11 & avoid copiesTom Cooksey2009-07-228-174/+422
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch tries to use texture_from_pixmap extentions on glX to properly bind an X Pixmap to a texture in QGLContextPrivate::bindTexture(QPixmap,). Because GL & X have different coordinate systems, the pixmap will be inverted about the y-axis. The extension does however allow a GLX_Y_INVERTED_EXT attribute to be set which will bind the pixmap the correct way up. If the underlying driver doesn't support this, texture_from_pixmap can't be used for QGLContext::bindTexture, because that function expects the resulting texture to be the right way up. However, it can still be used internally by the paint engine for drawPixmap operations. For these cases, if the pixmap is inverted, the paint engine can simply invert the texture coords to compensate. This is why this patch also moves QGLTexture into qgl_p.h. QGLContextPrivate::bindTexture(QPixmap,) now returns a QGLTexture which the paint engine can inspect to see if it needs to invert the texture coords. Finally, it seems on some (probably all) drivers, deleting an X pixmap which has been bound to a texture before calling glFinish/swapBuffers renders garbage. Presumably this is because X deletes the pixmap behind the driver's back before it's had a chance to use it. To fix this, we reference all QPixmaps which have been bound to stop them being deleted and only deref them after we swap the buffer, when they can be safely deleted. Reviewed-By: Kim
| * | Compile on embeddedOlivier Goffart2009-07-222-2/+2
| | |
generated by cgit v0.12 at 2024-11-12 15:01:46 (GMT)