summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-0223-1019/+1817
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+5
|\
| * 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0216-57/+117
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | i.e., use "", not <> and thus rely on the include path
| * Delete temporary file if copy was unsuccessfulJoão Abecasis2009-04-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | This is an untested bugfix -- comes solely from reading the code. In QFile::copy's fallback implementation a (temporary) file is created for block copying from the source file. When Qt is built without temporary file support this doesn't seem to be deleted in case of an error while block copying or renaming to the final destination. Reviewed-by: mariusSO
| * Renaming a file does not change QFile's fileNameJoão Abecasis2009-04-021-0/+5
| | | | | | | | | | | | | | | | | | | | QFile made no attempt to reset the file name on a rename. We now reset the fileEngine's fileName if it was able to handle the rename. Otherwise, we call setFileName, which will result in reallocation of the fileEngine. Task-number: 244485 Reviewed-by: mariusSO
| * QFile::rename didn't always return false when method failedJoão Abecasis2009-04-021-3/+9
| | | | | | | | | | | | | | | | | | The fallback implementation for rename would return true in some situations where the move failed. Also the destination file might be created and left there in these cases. Task-number: 244500 Reviewed-by: mariusSO
| * Doc - fixing a broken link in the documentation of QWebPageKavindra Devi Palaraja2009-04-021-1/+1
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Improved stylesheet support for setting background and foreground rolesJens Bache-Wiig2009-04-024-23/+19
| | | | | | | | | | | | | | | | | | | | This makes sure that style sheets set both ButtonText and WindowText roles for all widgets. This fixes among other things the fact that you could not configure text colors for combo box popups on Mac, Gtk and CleanLooks or set the background for the whole scrollbar. Task-number: 160713 Reviewed-by: ogoffart
| * Fixing some CoreText errors.Norwegian Rock Cat2009-04-022-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | Apparently CoreText is too good for us and always gives us fractional information. Which would be food for design metrics, but not good for drawing to the screen. The upshot of it is that we do the ceiling of every value we get. This is as stop gap solution for the moment. Things in Creator should look better now. Also added the ability to disable kerning. Reviewed-by: Simon Hausmann
| * Doc: Added a note about copying by value in QMetaProperty and included ↵David Boddie2009-04-021-3/+15
| | | | | | | | | | | | | | | | | | details about BlockingQueuedConnection in QMetaObject::invokeMethod(). Task-number: 187869 Task-number: 216742 Reviewed-by: Thiago Macieira Reviewed-by: Morten Sørvig
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-025-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-04-02 Takumi Asaki <takumi.asaki@nokia.com> Reviewed by Simon Hausmann. Fix pre-edit handling of text fields with input methods. The input method sends an empty preeditString() if all characters of the preedit should be deleted. So inputMethodEvent() has to use preeditString() if it's empty. * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): 2009-03-30 Simon Hausmann <simon.hausmann@nokia.com> Rubber-stamped by Tor Arne Vestbø. Document that setHtml/setContent loads only the html/data immediately, not external objects. * Api/qwebframe.cpp: * Api/qwebview.cpp:
| * Doc - fixed a typo: iterartor -> iteratorSimon Hausmann2009-04-022-4/+4
| | | | | | | | Reviewed-by: Trust me
| * Fix slowdown regression in QGraphicsItem::ItemCoordinateCacheAndreas Aardal Hanssen2009-04-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right before Qt 4.5.0 was released, Alexis and I submitted change 7e9b000ee418ef2d9c8fadb2c6b8870e0335bd5e, which accidentally introduced a rounding error causing items whose bounding rect contains fractional numbers (e.g., QRectF(-0.5, -0.5, 11, 11)), to always be drawn with a one-pixel strech even if otherwise untransformed. This caused a significant slowdown for pixmap items and any shape item that uses almost any pen width != 0, if they enable ItemCoordinateCache. The fix is to consistently use the aligned rectangle both when generating the cache pixmap and when drawing it. Reviewed-by: Alexis
* | Don't need to update visibility and enabled if the item is destructingJan-Arve Sæther2009-04-021-8/+9
| | | | | | | | | | | | | | | | This actually caused a crash, since we would call the pure virtual boundingRect() function in setVisibleHelper(). (The 'update' argument was set to true.) Reviewed-by: andreas
* | Improve performance of text blitting in raster paint engine.Samuel Rødal2009-04-021-2/+2
| | | | | | | | | | | | Use INTERPOLATE_PIXEL_255 instead of two BYTE_MUL's. Reviewed-by: Gunnar Sletta
* | Compile error on VisualStudio 2005Prasanth Ullattil2009-04-021-0/+9
| | | | | | | | Reviewed-by: Samuel
* | Wrong property type (QVariant&) generated by ActiveQtPrasanth Ullattil2009-04-021-4/+8
| | | | | | | | | | | | | | | | | | This was due to an incorrect type defenition in the typelibrary for a particular COM object. Enven in such cases we should not generate an incorrect type. Task-number: 248612 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@nokia.com>
* | Visual tweaks on the new dialJens Bache-Wiig2009-04-021-9/+9
| | | | | | | | | | Increased contrast and size of indicator line. Reviewed-by: nrc
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-10/+14
|\ \ | |/
| * Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
| | | | | | | | | | Task-number: 240164 Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
| * Doc: Trivial fixes.David Boddie2009-04-011-4/+4
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0138-247/+678
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Doc - clarified that QMessageBox's predefined icons are not defined inKavindra Devi Palaraja2009-04-011-16/+16
| | | | | | | | | | | | | | QMessageBox, but provided by the style. Task-number: 249946 Reviewed-by: TrustMe
| * Marked QWidget::resetInputContext() function as obsolete.Denis Dzyubenko2009-04-011-4/+8
| | | | | | | | | | | | | | | | | | Fixed the behavior of the function that was broken by me some time ago. But anyway this function is for convenience only since QInputContext that operates on the widget is available to the user directly. Reviewed-by: Prasanth Ullattil
| * Removed obsolete internal function that focuses input context.Denis Dzyubenko2009-04-013-25/+0
| | | | | | | | Reviewed-by: TrustMe
| * Input Method cannot be enabled in License Wizard and Class WizardDenis Dzyubenko2009-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | Input methods didn't work properly wor widgets inside QWizardPage because the widget got focus before it was shown and input context wasn't initialized properly. The fix is to postpone qinputcontext->setFocusWidget call until the widget is created (input context will be initialized in the QWidget::create_sys function). Task-number: 244604 Reviewed-by: Prasanth Ullattil
| * Subject: Fix typo in CompositionMode sectionAndy Shaw2009-04-011-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * QNetworkInterface: fix listing of all interfacesPeter Hartmann2009-04-011-3/+3
| | | | | | | | | | | | | | | | Before, we returned 0 for many interfaces because we picked up the IPv6 address regardless whether it was 0 or not. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: 249312
| * QComboBox with Qt::NoFocus triggers a crash.Prasanth Ullattil2009-04-011-3/+7
| | | | | | | | | | | | | | | | | | The showPopup() from a combobox triggers a crash. This happens only for a combobox which dosen't accept focus and it has been recreated. This is due to some invalid widget pointer stored in the input context. Task-number: 249576 Reviewed-by: ddenis
| * Subject: Added platform spec. note about type convertionMorten Engvoldsen2009-04-011-0/+8
| | | | | | | | | | | | | | | | Details: Added a note to the description about using POSIX functions for converting between data types such as floats and strings Task-number: 244600 Reviewed-by: Denis Dzyubenko Reviewed-by: Geir Vattekar
| * Changes: Clearifying docs on qInstallMsgHandlerMorten Engvoldsen2009-04-011-2/+4
| | | | | | | | | | | | Details: Added comment about QT_NO_WARNING_OUTPUT and/or QT_NO_DEBUG_OUTPUT on http://doc.trolltech.com/4.5/qtglobal.html#qInstallMsgHandler Review-by: Geir Vattekar
| * Adding note to the qFuzzyCompare docMorten Engvoldsen2009-04-011-1/+6
| | | | | | | | | | | | | | | | Adding note about how comparing using 0.0 will fail, and an example on how to do it. Reviewed-by: David Boddie Reviewed-by: Geir Vattekar
| * Subject: Mention setProxy() should be called before setHost() in the docAndy Shaw2009-04-011-1/+5
| | | | | | | | Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
| * Subject: A couple of minor doc fixesAndy Shaw2009-04-011-1/+1
| | | | | | | | Reviewed-by: Morten Engvoldsen
| * Subject: Compile fix on WindowsAndy Shaw2009-03-311-2/+2
| | | | | | | | Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
| * CompileAnders Bakken2009-03-311-1/+0
| | | | | | | | | | | | I messed up the cherry-pick merge and left one of these in. Reviewed-by: TrustMe
| * Remove these convenience functions.Anders Bakken2009-03-311-22/+12
| | | | | | | | | | | | | | They only make sense under the assumption that there most of the time is no transform. With Falcon this isn't really the case. Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * No sense in detecting the format twiceAnders Bakken2009-03-311-6/+2
| | | | | | | | | | | | | | Use the format passed in to the function rather than detecting it again based on hasAlphaChannel(). Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Prevent crash on resizingAnders Bakken2009-03-311-4/+16
| | | | | | | | | | | | | | | | | | | | The crash was caused by out-of-bounds reading on the raster engine's clipping structures since our size had changed size last lock. This code makes sure the clipData structures are atleast as tall as the current height of the paint device. Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Doc: Made it clearer that QProcess::start() only starts a new process if one ↵David Boddie2009-03-311-9/+16
| | | | | | | | | | | | | | is not already running. Task-number: 231513 Reviewed-by: TrustMe
| * Doc: Clarified that the main use case for QRegion is as a clipping primitive ↵David Boddie2009-03-311-9/+13
| | | | | | | | | | | | | | not as a rendering primitive. Task-number: 183493 Reviewed-by: TrustMe
| * Doc: Removed a reference to a deprecated function.David Boddie2009-03-311-4/+4
| | | | | | | | | | | | Reported by a former Doc Manager. Reviewed-by: TrustMe
| * Get the qt7 phonon plugin to minimally compile on 10.6Norwegian Rock Cat2009-03-313-7/+11
| | | | | | | | | | | | | | | | | | | | We need to protect some overridden type and that is done in qmacdefines_mac.h, so just include that. To top this off, a function has changed that was introduced in 10.5. In order to use it properly, we would need to do lots of version checking and shuffling between types and it seems like more trouble that it's worth at the moment. We may have to do that in the future, but we'll deal with that then.
| * QProcess::start() segfaults on empty programBradley T. Hughes2009-03-311-0/+9
| | | | | | | | | | | | | | | | Handle cases where QProcess::start() and startDetached() are passed a null, empty, or "invalid" program string instead of crashing. Task-number: 247865 Reviewed-by: Andreas Aardal Hanssen
| * Fix bug in QDirIterator that clear the cache of the fileinfoAlexis Menard2009-03-311-17/+17
| | | | | | | | | | | | | | | | We basically store the currentFileInfo and use another one to continue moving into the dir. Task-number: 247645 Reviewed-by: Olivier
| * Add Windows7 and Snow Leopard as values QSysInfo.Norwegian Rock Cat2009-03-312-7/+20
| | | | | | | | | | | | | | | | It's likely these OS's will show up before we are done with 4.5, so it is worthwhile to have these values here, so that both we and other developers can do nice things with them. Reviewed-by: Prasanth Ullattil
| * Fix text drawing and perspective transforms for the Windows, PDF andTrond Kjernåsen2009-03-314-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | PostScript print engines. The PDF/PostScript does not support perspective transforms, so it has to be emulated through our draw_helper() fallback. PostScript doesn't support alpha blending, so all perspective drawing needs to be forced through the alpha print engine. Task-number: 249754 Reviewed-by: Samuel