summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile.Norwegian Rock Cat2009-07-241-1/+1
| | | | | | | It appears that uint != UInt32 in 32-bit world, don't ask why. Correct the typedef. Reviewed-by: Carlos Duclos
* Fix build on HPUXTom Cooksey2009-07-241-0/+2
| | | | Reviewed-By: Trustme
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Yard2009-07-24307-5085/+5051
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-07-2359-2992/+1199
| |\
| | * Reverted commits that changed the behavior of the keypresses with modifiers.Denis Dzyubenko2009-07-233-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently it changes the behavior of Qt too much and also breaks the text input in some keyboard layouts (for example in German layout you need to be able to use Ctrl and Alt or AltGr modifiers to type text). Revert "Don't insert text into a text widget when a modifier is pressed." This reverts commit 099a32d121cbc80a1a234c3146f4be9b5237e7e8. Revert "Fixed the qlineedit autotest." This reverts commit 9210e8cdc83b6812d10f5f5847d05703ef2e5f7c.
| | * Implement an FSEvents-based QFileSystemWatcherEngineNorwegian Rock Cat2009-07-235-2/+687
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been around for a while and really should have been put in earlier. Mac OS X (client) has a much lower ulimit for open files than what some other Unix-like OS's have (in defense it does save memory). However, if you start watching a lot of files, it will start to fall down. You can adjust the ulimit, but it's a bit inconvenient. FSEvents watches the directory and notifies you of changes that happen in that directory (and below, but we don't really use it). It also can be adjusted for latency so that performance isn't affected by heavy file system use (but Qt doesn't use that either at the moment). The other thing is that it doesn't require any open files, so it's much better for our number of open files. This feature is only on Leopard and up, so people wanting to deploy Tiger will still have the "open files" problem to deal with. There are still some optimizations available in this code. For example, we could coalesce things down to watch only one high-level directory without changing much of the implementation. The current implementation has some very simplistic ways of handling things, but this simplicity works well. I documented it, so you can see that, yes, I really meant to do that. Task-Id: 164068 (and others) Reviewed-by: Denis
| | * Fix incorrect button positioning on tabsJens Bache-Wiig2009-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | For tabs with RoundedWest or TriangularWest the button offset was reversed on tab selection. This was very visible on windows where they could actually move outside the tab border. Task-number: 255139 Reviewed-by: paul
| | * configure shows Windows CE specific build steps when its doneJoerg Bornemann2009-07-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | For cross compilation of Qt for Windows CE the user must call setcepaths before nmake. Now configure shows a helpful message if the xplatform configure switch was used. Task-number: 257352 Reviewed-by: thartman
| | * Some minor doc fixes.Robert Griebl2009-07-232-8/+8
| | | | | | | | | | | | Reviewed-by: Kavindra
| | * 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
| | |
| * | Doc: Clarified that the format used in QImage::fromData() is the imageDavid Boddie2009-07-231-27/+31
| |/ | | | | | | | | | | format, not the pixel format. Reviewed-by: Trust Me
| * 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
| |