summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0618-144/+250
|\
| * Remove QTDIR dependency from moc autotestSimon Hausmann2009-04-061-10/+26
| | | | | | | | | | | | | | Use qmake -query QT_INSTALL_HEADERS at test startup time instead of relying on the dead QTDIR environment variable. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Moc autotest cleanupSimon Hausmann2009-04-061-12/+0
| | | | | | | | | | | | Remove unused QTDIR tests. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Fix moc autotest failuresSimon Hausmann2009-04-062-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | We have to pass the correct include paths when testing the multiple inheritance warning, because we want moc to find the QtGui and QObject headers. In addition we have to adjust the line numbers and include QObject in the qobject test to avoid a warning about the unknown QObject superclass. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * BT: Fix a crash when running a widget window modal when it has no parentNorwegian Rock Cat2009-04-061-7/+5
| | | | | | | | | | | | | | | | We changed the logic for determining sheets, but it seems we forgot to take the parentWidget() into account. It's required for WindowModality to make any sense. Reviewed-by: Richard Moe Gustavsen
| * QThread::start(): priority has no effect on Linux systemsBradley T. Hughes2009-04-061-0/+12
| | | | | | | | | | | | | | | | | | The default scheduling policy on Linux doesn't allow specifying thread priorities, so the priority passed to start() and setPriority() has no effect. Document this. Task number: 249997 Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
| * Fix up color matching on 64-bit Cocoa.Norwegian Rock Cat2009-04-061-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that GetThemeTextColor is not available at all for 64-bit versions of the operating system and there is no good equivalent. We were using a technique where we would create a small pixmap and then use HIThemeSetTextFillColor() with the proper enum. However, this function will silently set a black color if it doesn't know about the enum. So, we get black when we really shouldn't. It also seems to produce colors that are a bit different from the Carbon function. So, in the meantime, just hard code the values in. It might break if you are hacking the resources in Mac OS X, but we'll have to live with that until we get a real function. Task-number: 248918 Reviewed-by: Prasanth Ullattil
| * Fix QNetworkReply's automatic pushing of a cache when the cache isThiago Macieira2009-04-061-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more than 64k. This issue was found by Warwick: the copyReadyRead() slot is called only once as a result of readyRead(), but since there's no more data to be received (the source QIODevice is a QBuffer), we'll never get a readyRead() again. So, if we don't have a limited buffer size, we should read everything. This applies to QFile as well. The side-effect is that we cause the entire QFile to be loaded to memory, so if you had a 2 GB cache entry, you'll probably run out of memory. Future optimisations: - don't memcpy the data from a QBuffer into another buffer - find a way to avoid loading the entire contents of the file (probably not possible with the default QNetworkDiskCache since that may compress the data, so we won't know the size and thus can't fake finished()) Reviewed-by: Warwick Allison
| * Update the qmake documentation regarding when the .qmake.cache isAndy Shaw2009-04-061-0/+3
| | | | | | | | | | | | processed. Reviewed-by: TrustMe
| * Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-042-21/+14
| | | | | | | | | | Reviewed-by: TrustMe BT: yes
| * Add some timing capabilitiesAnders Bakken2009-04-043-1/+26
| | | | | | | | | | | | | | Add some frames-per-second output for debugging when QT_DIRECTFB_TIMING is defined. Reviewed-by: Donald <qt-info@nokia.com>
| * QScreen::flush() no longer draws the titlebarAnders Bakken2009-04-041-5/+0
| | | | | | | | | | | | We don't need to chain to the base class anymore. Reviewed-by: Donald <qt-info@nokia.com>
| * Silence warning and beautify codeAnders Bakken2009-04-032-24/+13
| | | | | | | | | | | | | | Even though these variables couldn't really be used uninitialized GCC 4.3.2 thinks it could. This is nicer, more readable and faster anyway. Reviewed-by: Donald <qt-info@nokia.com>
| * QGtkStyle: Fix styling and palette issues related to combo boxJens Bache-Wiig2009-04-035-39/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well actually this change is a bit bigger than just that. *We no longer override the palette you provide in polish so it should be a bit more frienly toward custom application changes. * Another issue was that we would generate the palette information when we got the style callback from gtkButton but then the line edits might not yet have been polished. Hence we now return from the callback and instead post the update for later. * We had to modify the PE_Frame entry to draw a raised menu when the custom combo box delegate was used. * We now simply ignore custom qtconfig palette entries when using GtkStyle since they only cause trouble with it. Task-number: 250142 Reviewed-by: nrc
* | Add missing license headers.Jan-Arve Sæther2009-04-065-4/+209
| |
* | Speed up selectAll in QTreeView with spansOlivier Goffart2009-04-061-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | When we had spans, in order to have the selection rect, we took the slow path in all cases, even if the header section did not move. Now, take the fast path if the sections did not move. This requires few adjustement to the code: we cannot call visualRect anymore since the index may be within a span. Task-number: 244651 Reviewed-by: Marius Bugge Monsen
* | Sppedup QTreeView with spans.Olivier Goffart2009-04-063-149/+267
| | | | | | | | | | | | | | | | | | | | | | Introduce an index to lookup spans in a certain index in a logaritmic time instead of linear. Behaviour change include that it is no longer possible to have spans with height or with of 0 (but this made no sens anyway) Reviewed-by: Marius Bugge Monsen Task-number: 244651
* | Benchmark for QTableView and spansOlivier Goffart2009-04-062-0/+199
| |
* | Fixes: QTextStream crashes on large inputsOlivier Goffart2009-04-061-1/+8
| | | | | | | | | | | | | | | | The buffer was only shrinked if we reach exactly the end of it. Reviewed-by: Andreas Reviewed-by: Thiago Task-number: 221316
* | Forgot to remove a debug outputRobert Griebl2009-04-031-1/+0
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-04-0320-45/+206
|\ \ | |/
| * Fixes crash in QTreeView with QSortFilterProxyModelOlivier Goffart2009-04-031-0/+1
| | | | | | | | | | | | | | | | | | If we get an hover event while the model gets invalidated, we might ends up calling itemDecorationAt before the viewitem is refreshed. Can be reproduced in KTorrent (Relates to KDE bug 172198) or Kopete trunk Reviewed-by: Thierry
| * Do not loose WindowType flags when setting translucent background in X11Olivier Goffart2009-04-031-1/+1
| | | | | | | | | | | | | | | | This fixes KRunner on XMonad. The Qt::Dialog flag of the krunner dialog was lost when the Qt::WA_TranslucentBackground was set, leading to incorrect behaviour in some window manager (such as xmonad) Reviewed-by: Samuel
| * Fix a crash in QFileDialog with a proxy on it.Alexis Menard2009-04-033-22/+91
| | | | | | | | | | | | | | | | | | | | | | | | The main problem is that enterDirectory received a QModelIndex that can be a proxy index and not a source index if there is a proxy set on the QFileDialog. This fix basically discover some other crashes in the completer. The problem was that we didn't apply the proxy to the completer too. So we basically messed up source and proxy indexes. Both have a proxy set now and convert the model indexes if needed. Task-number:250194 Reviewed-by:jasplin
| * Use QMAKE_LIBS_OPENGL_QT in the GL ES config testsTom Cooksey2009-04-033-3/+3
| | | | | | | | | | | | | | | | | | The OpenGL ES config tests are there to test if there's enough to build QtOpenGL, not OpenGL applications using Qt. Therefore we should use QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely because Qt needs to link against EGL whereas Qt applications do not. Reviewed-by: TrustMe
| * Add config test for XLibTom Cooksey2009-04-033-0/+20
| | | | | | | | | | | | | | | | | | Previously, it was entirely possible to successfully configure Qt/X11 without any X11 installed. The problems would only start showing up once you stated building. This is not very useful if you're cross-compiling and trying to setup the paths correctly. Reviewed-by: Denis
| * BT: Compilation on WinCE.Trond Kjernåsen2009-04-031-1/+1
| | | | | | | | Reviewed-by: Kim
| * Use the standard 'type name = value' variable declaration for PODThiago Macieira2009-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | types. C++ is nice, but we don't have to use confusing syntax when plain old C works (and is correct). This apparently fixes a compilation error on MSVC 6, that doesn't like the constructor-like initialisation for POD types. Reviewed-by: Trust Me BT: yes
| * Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-034-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there is no way to find out if gradient stops have been added to a gradient, a gradient stop at NaN was earlier used in the SVG module to mark the gradient as empty. This could cause floating point exceptions. The usage of NaN has now been replaced by a boolean in QSvgGradientStyle. Duplicate entry "qxmlpatterns" was removed from auto.pro in the auto test directory. Task-number: 250146 Reviewed-by: Samuel
| * Fix focus policy propagation bug in QCompleter.jasplin2009-04-032-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4a00810cc394b7da99ddb2d13eb045352ede25d3 ensures that setting the focus policy of a widget applies to its proxy (if any) as well. This propagation effect is however unfortunate for a QCompleter in PopupCompletion mode. The client widget (typically a QLineEdit or a QTextEdit) acts as the focus proxy to the popup menu. Internally, the completer sets the focus policy of the popup menu to NoFocus, but this should not affect the focus policy of the editor. Reviewed-by: janarve Task-number: 250064
| * My changesJarek Kobus2009-04-031-0/+1
| |
* | Merge branch '4.5'Rhys Weatherley2009-04-032-1/+4
|\ \ | |/
| * Suppress unnecessary "Could not re-create the temporary EGL surface" warningsRhys Weatherley2009-04-031-1/+1
| | | | | | | | | | | | | | The wrong temporary surface id was being used to recreate the EGL surface. It was "tempSurface" when it should have been -1. Reviewed-by: Ian Walters
| * Add information about QT_* defines that are needed to make PowerVR workRhys Weatherley2009-04-031-0/+3
| | | | | | | | | | | | | | The QT_QWS_CLIENTBLIT and QT_NO_QWS_CURSOR defines must be supplied or the direct paint regions used by the PowerVR driver won't work. Reviewed-by: trustme
* | Build breakage: QStringList declaration missing in qkbd_qws.cppRhys Weatherley2009-04-021-0/+1
| | | | | | | | Reviewed-by: trustme
* | Make QWS a bit more OS independent.Robert Griebl2009-04-028-23/+29
| | | | | | | | | | | | | | Some patches needed to support QWS on non-Linux platforms. Reviewed-by: Paul Olav Tvete Reviewed-by: Harald Fernengel
* | Keymap support for QWS.Robert Griebl2009-04-0227-1020/+2780
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for keymaps to the QWSKeyboardHandler. The keymaps can be generated by the kmap2qmap tool (see tools/ directory). The source keymaps can be standard Linux .kmap files. Changes to Qt: * completely refactored the Tty and Usb (now known as LinuxInput) handlers * removed the LinuxIS plugin (handled by LinuxInput now) * removed support for iPAQ, EBX and Zylonite keypads (obsolete hardware) * removed support for RAW tty mode. This could be re-added, for non-Linux systems by implementing a PC/AT scan-code to Linux keycode converter. New features for Tty and LinuxInput (ex Usb) handlers: * support for keymaps QWS_KEYBOARD=..:keymap=/path/to/x.qmap:.. * support for dead keys and the compose key * support for lock LEDs * support for key repeat rates (in ms): QWS_KEYBOARD=..:repeat-delay=x:repear-rate=y:.. * the default keymap supports latin1 composing via AltGr: QWS_KEYBOARD=..:enable-compose:.. * ctrl+alt+backspace application zapping can be disabled: QWS_KEYBOARD=..:disable-zap:.. * added virtual filter functions to both the Tty and the LinuxInput handlers. (QWSKeyboardHandler::processKeycode should be virtual in the first place, but that would be BIC) Still missing: * extended documentation for QWS_KEYBOARD Reviewed-By: Paul Olav Tvete Reviewed-By: Harald Fernengel
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-027-4/+85
|\ \ | |/
| * some more quoting for qmake ...Oswald Buddenhagen2009-04-022-2/+2
| | | | | | | | sometimes, even two reviews are not enough ...
| * Adding auto-tests for commits a2fcc4a5 and 8d500381João Abecasis2009-04-024-1/+78
| | | | | | | | | | | | | | Task-number: 244500 Task-number: 244485 Reviewed-by: ossi Reviewed-by: thiago
| * Only set system style when it actually changesJens Bache-Wiig2009-04-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | This issue would cause Qt Creator and similar apps with proxy styles to loose their custom styling whenever any x11 system settings changed. This happened because we would re-read the settings and override the system style even if the system style did not actually change would be set on the application. We Task-number: 250199 Reviewed-by: ogoffart
* | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
| |
* | don't lose codecForTr in c++ parserOswald Buddenhagen2009-04-021-1/+3
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0247-597/+439
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| | | | | | | | | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-024-12/+19
| |\
| | * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | | | | | i.e., use "", not <> and thus rely on the include path
| | * re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
| | | | | | | | | | | | | | | | | | | | | this time, it can deal with directories which are absolute to start with. Reviewed-by: mariusSO
| | * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| | |
| | * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
generated by cgit v0.12 at 2024-10-25 19:25:36 (GMT)