summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'graphics-main'Gunnar Sletta2009-04-0322-396/+1165
|\
| * Fixes: make the toNormalizedFillRect function slightly fasterGunnar Sletta2009-04-011-5/+10
| | | | | | | | RevBy: sroedal
| * Fixes: Prevent QGLFramebufferObject from resetting the current context.Samuel Rødal2009-04-011-2/+4
| | | | | | | | | | RevBy: Trond Details: If there is already an active context we don't need a dummy widget.
| * Fixes: Use the new framebuffer blit/multisample API in the window surface.Samuel Rødal2009-04-011-18/+31
| | | | | | | | RevBy: Trond
| * Fixes: Add blitting and multisample API to QGLFramebufferObject.Samuel Rødal2009-04-016-30/+520
| | | | | | | | | | | | RevBy: Trond Details: Support GL_EXT_framebuffer_multisample and GL_EXT_framebuffer_blit in the QGLFramebufferObject API.
| * Fixes: Make FBO window surface work with GL 2 paint engine.Samuel Rødal2009-04-012-0/+7
| | | | | | | | | | | | RevBy: Trond Details: Need to make sure clipping/scissoring etc is turned off and that we are in a good state.
| * Fixes: Respect the SmoothPixmapTransform render hint in the GL2 paint engine.Samuel Rødal2009-04-011-1/+1
| | | | | | | | RevBy: Tom
| * Fixes: Get rid of GL 2 paint engine debug message...Samuel Rødal2009-04-011-2/+0
| | | | | | | | RevBy: Tom
| * Fixes: Small optimizations in GL 2 paint engine...Samuel Rødal2009-04-011-3/+3
| | | | | | | | RevBy: Tom
| * Fixes: Clipping bug in GL 2 paint engine (embeddeddialogs demo).Samuel Rødal2009-04-011-0/+1
| | | | | | | | RevBy: Tom
| * Fixes: Extreme amount of pixel buffers created in embeddeddialogs demo.Samuel Rødal2009-04-012-3/+12
| | | | | | | | | | | | Details: As a window surface is created even for embedded widgets, don't create the GL resources required by the surface until they are actually needed. RevBy: Tom
| * Fixes: Make raster engine perform better on 0-opacity drawingGunnar Sletta2009-04-012-7/+19
| | | | | | | | | | RevBy: sroedal Task: came in from brisbane
| * Fixes: Introduce mode transfer functions in the GL 2 paint engine.Samuel Rødal2009-04-012-53/+94
| | | | | | | | | | | | | | | | RevBy: Tom Details: Mode transfer lets us optimize the case where the same operation is done a lot of times in a row, for example image or text drawing, by being able to assume that most of the state has already been set up properly.
| * Fixes: Enable use of the GL pixmap backend in the GL 2 paint engine.Samuel Rødal2009-04-014-8/+20
| |
| * Fixes: GL 2 paint engine text rendering optimization.Samuel Rødal2009-04-014-57/+52
| | | | | | | | | | | | | | RevBy: Tom Details: Buffer vertex and texture coordinates so that we get away with just a single glDrawArrays call per text item. Also move drawCachedGlyphs() into the private class.
| * Fixes: Improve text rendering in GL 2 paint engine.Samuel Rødal2009-04-011-2/+2
| | | | | | | | | | Details: Avoid adding 0.5 to dx() / dy() which caused images / glyphs to get slight antialiasing and edge artifacts.
| * Get rid of warning introduced in the last commit.Samuel Rødal2009-04-011-1/+1
| |
| * Fixes: Move QGLDrawable into qgl_p.h so that we can use it in the GL 2 ↵Samuel Rødal2009-04-014-185/+193
| | | | | | | | | | | | | | | | paint engine. RevBy: Tom Details: Now we can use the GL 2 paint engine on non-widget paint devices like pixel buffers, framebuffer objects, and GL window surfaces. Using -graphicssystem opengl works now.
| * Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-0111-31/+207
| |
* | 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-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