summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-081-1/+1
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-061-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "QSystemTrayIcon::messageTimeout() signal implemented" print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
| | * Revert "QSystemTrayIcon::messageTimeout() signal implemented"Paul Olav Tvete2010-12-063-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a5b81532d482b611d5ea8b3a93e6ee9f9098db0. Reverted because the autotest fails. Reviewed-by: Gunnar
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-044-2/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-024-2/+19
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-014-2/+19
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-014-2/+19
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-11-2947-309/+838
| | | | | | |\
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-263-1/+18
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSystemTrayIcon::messageTimeout() signal implemented
| | | | | | | | * QSystemTrayIcon::messageTimeout() signal implementedminiak2010-11-263-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3870 Merge-request: 710 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | | | | | * | | compile with debug defined enabledGunnar Sletta2010-11-241-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-073-15/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | QGtkStyle: Use gtk_progress_configure() instead of adjustment APIAndreas Kling2010-12-063-15/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no corresponding getter for gtk_progress_set_adjustment() anyway, so the old code was actually crashing. Reviewed-by: Jens Bache-Wiig
* | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0518-1/+4307
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-0218-1/+4307
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
| | * | | | | | Simple fixes for CI gateRobert Griebl2010-12-023-4/+4
| | | | | | | |
| | * | | | | | Fix compile on QWSRobert Griebl2010-12-021-1/+1
| | | | | | | |
| | * | | | | | Fix code style issues in QScrollerRobert Griebl2010-12-023-8/+8
| | | | | | | |
| | * | | | | | QScroller merge, part 1Robert Griebl2010-12-0218-1/+4307
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge consists of the actual kinetic scroller implementation, its autotests plus a few examples. QAbstractScrollArea and QAbstractItemView have been extended to support the new scroll events. The complete history is in http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture (part 2 is the QML Flickable replacement / part 3 is QWebView support) Task-number: QTBUG-9054 Reviewed-by: Ralf Engels
* | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0334-1012/+1779
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-12-0234-1012/+1779
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (23 commits) Restore patch that got lost in merge Fix spelling in comment Spelling mistakes in Documentation. There are probably more :) Fix spelling mistake in QEGLPlatformcontext Restore patch that disappeared in merge Make the openKODE use the new eventloopintegration api. Make QtOpenGL use shared contextexts on Lighthouse Move the Lighthouse specfic api into qpa_qpa.cpp Lighthouse: Fix QGLContext::currentContext for systems with limited Make EglFS plugin compile after changes to QPlatformEGLContext Adding some documentation for Lighthouse Lighthouse: move the currentContext functionality to QPlatformGLContext Remove QWidget::paintEngine() codepath for Lighthouse Fix transformIsSimple in QGraphicsScene Lighthouse: Make sure that we call QPlatformWindow::setVisible Lighthouse: using QFont enums when possible in QPlatformFontdatabase No more windowsurface for QGLWidget in Lighthouse Add workaround_brokenFBOReadback=true for mali Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629 Compile fix for c1148ee9a60a6fae8. ...
| | * | | | | Restore patch that got lost in mergeJørgen Lind2010-12-022-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge was: e50e811461b54e07184af547f62aa44b3c5bb681 The parts of these commits was lost in the manual merge: 46d2d05e3a95eefae1c72f55d57cbea4ce27d14e 8e8bae1f4faf676b6104bbf9039ad10f139fa7e8 344a4dcfe847dd778c33d1a852381672dd331409 e45c4387ae16627d61e30a58ae901d888d375aa7 And I also added a license header to qfontengine_coretext.mm Reviewed-by: paul
| | * | | | | Fix spelling in commentJørgen Lind2010-12-021-1/+1
| | | | | | |
| | * | | | | Spelling mistakes in Documentation. There are probably more :)Jørgen Lind2010-12-013-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | * | | | | Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | e50e811461b54e07184af547f62aa44b3c5bb681
| | * | | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-2959-356/+877
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-262-12/+18
| | | | | | |
| | * | | | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-242-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources. The example plugins EGLFS uses only 1 native context. Make sure that we only use this 1 context, and that we dont wrap it in many different QPlatformGLContexts or QGLContexts instanses. This change also removes the QPlatformWindow link which was made in the initial QPlatformGLContext change. Lighthouse has to support situations where a context isnt bound to a QPlatformWindow. Reviewed-by: gunnar
| | * | | | | Adding some documentation for LighthouseJørgen Lind2010-11-2210-10/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spirit here is "something is better than nothing". Ie. its the first itteration of documenting the classes. No general Lighthouse introduction yet...
| | * | | | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-223-8/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means the threading functionality has been delegated down to QPlatformGLContext. However, it is still possible to use QGLContext::currentContext to retrieve the QGLContext. This so that QGLFunctions, QGLShaderProgram etc can be used without a QGLWidget. Reviewed-by: paul
| | * | | | | Remove QWidget::paintEngine() codepath for LighthouseJørgen Lind2010-11-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | * | | | | Fix transformIsSimple in QGraphicsSceneJørgen Lind2010-11-221-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformIsSimple was a bit to restrictive Reviewed-by: bnilsen
| | * | | | | Lighthouse: Make sure that we call QPlatformWindow::setVisibleJørgen Lind2010-11-221-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on native child widgets. Reviewed-by: paul
| | * | | | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-223-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, make it possible to register fonts in QPlatformDatabases with a null handle Reviewed-by: paul
| | * | | | | No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-223-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1987-395/+1017
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| | * | | | | | Compile fix for c1148ee9a60a6fae8.Paul Olav Tvete2010-10-291-2/+0
| | | | | | | |
| | * | | | | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-2814-888/+1014
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The declaration of QCoreTextFontEngine was ifdefed in qfontengine_p.h. So was QMacFontEngine. I have moved them into their own files (qfontengine_coretext_p.h and qfontengine_mac_p.h).
| | * | | | | | Lighthouse: eventloop integration rework.Jørgen Lind2010-10-283-8/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For cocoa we really need to be able to run the cocoa eventloop [NSApplicatyion run]. Also it makes sense for openKODE without nvidia extensions.
* | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-023-15/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | QGtkStyle: Don't create new GtkAdjustment objects on every drawAndreas Kling2010-12-013-15/+51
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gtk_*_get_adjustment() and gtk_adjustment_configure() to re-use the previously set GtkAdjustment on GtkProgress and GtkRange. Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* | | | | | | Fixed a problem with toolbars not relayoutingThierry Bastian2010-12-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen when dragging an extended toolbar from a mainwindow PAtch was provided on IRC by ravek (#dev) Task-number: QTBUG-10920 Reviewed-by: Trust-Me
* | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-013-40/+46
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching from a format without alpha channel to one that has it, reuse the underlying QImage memory if the old & new color depths match. This avoids one allocation when using the rather common pattern: QPixmap pixmap(w, h); pixmap.fill(Qt::transparent); Reviewed-by: Samuel Rødal
* | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-276-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Corrected case on Symbian library.axis2010-11-261-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | RevBy: Trust me
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-255-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix some memory leaks.
| | * | | | Fix some memory leaks.Fabien Freling2010-11-255-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the retain/release mechanism for CGContexts. Some leaks were due to unnecessary retain calls. Task-number: QTBUG-15373 Reviewed-by: Samuel Rødal
* | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-2652-345/+833
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-252-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix performance penalty in Win32MakefileGenerator::findHighestVersion Allow QDial to wrap value when wrapping property is set. QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)
generated by cgit v0.12 at 2025-04-03 23:23:02 (GMT)