summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import shader implementation from before the history cut.Rhys Weatherley2009-04-0317-1070/+3619
|
* Merge branch 'graphics-main'Gunnar Sletta2009-04-0324-401/+1191
|\
| * Fixes: make the toNormalizedFillRect function slightly fasterGunnar Sletta2009-04-011-5/+10
| | | | | | | | RevBy: sroedal
| * Fixes: Use the blit/multisample FBO API in the framebuffer object example.Samuel Rødal2009-04-012-5/+26
| | | | | | | | RevBy: Trond
| * 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-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
| | * | fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | | | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
| * | | fixes empty tab after pdf file open, new tab after middle mouse clickkh2009-04-022-3/+57
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | | fixes empty tab after pdf file openkh2009-04-021-3/+10
| |/ / | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | fixes empty tab after pdf file openkh2009-04-022-6/+17
| | | | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | make the configured namespace part of QT_BUILD_KEYhjk2009-04-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The eclipse integration is namespaced, but it pulls in system plugins like the oxygen style. This breaks as the (non-namespaced) style plugin does not find a suitable QApplication instantiated (only a namespace one is there) Reviewed-by: thiago Task-number: 250185
| * | Small changes in qmake's fileFixifyJoão Abecasis2009-04-021-9/+3
| | | | | | | | | | | | | | | | | | | | | Removed dead code and simplified conditionals. This should not otherwise change behavior or output of qmake in any way. Reviewed-by: mariusSO
| * | In qmake tests, allow child environment to be manipulatedJoão Abecasis2009-04-023-2/+18
| | | | | | | | | | | | | | | | | | ... without having to change the parent process's environment. Reviewed-by: mariusSO
| * | Spring cleaning in qmake testsJoão Abecasis2009-04-027-107/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
| * | Remove dependency on Qt3 support from qmake testsJoão Abecasis2009-04-024-185/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt3 support prevented the tests from running on Mac Cocoa. Also started some Spring cleaning (it's just around the corner!) and applied some YAGNI :-) Reviewed-by: NRC Reviewed-by: mariusSO
| * | 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