summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move test data to a qrc file.Jedrzej Nowacki2010-12-069-48/+25
| | | | | | Using qrc file simplify deployment on a device. Reviewed-by: Kent Hansen
* Fix license header.Jason McDonald2010-12-061-5/+5
| | | | Reviewed-by: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-0339-7/+7124
|\ | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make it compile on Mac OS X 10.5 Touch events do not work on Mac OS 10.5 Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
| * Make it compile on Mac OS X 10.5Robert Griebl2010-12-031-2/+2
| |
| * Touch events do not work on Mac OS 10.5Robert Griebl2010-12-031-2/+10
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-0339-7/+7116
| |\ |/ / | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-0239-7/+7116
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-024-4/+44
| | |
| | * 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-0239-7/+7076
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-035-8/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed various DEPLOYMENT variable ".sources" suffixes to ".files"
| * | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-025-8/+8
| |/ | | | | | | | | | | | | Starting from Qt 4.8, ".files" is the correct variable suffix to use for declaring deployment files. Reviewed-by: Janne Koskinen
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-12-0260-1192/+2145
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix spelling mistake in QEGLPlatformcontextJørgen Lind2010-12-014-4/+4
| | | | | | | | | | | | | | | | | | Autocompletion and a hint of dyslexia made me not see this before :) 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-3011-52/+579
| |\ \
| * \ \ Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-29835-20340/+34323
| |\ \ \
| * | | | Make the openKODE use the new eventloopintegration api.Jørgen Lind2010-11-264-14/+24
| | | | | | | | | | | | | | | | | | | | And also make it work with the new GL functionality in Lighthouse
| * | | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-269-49/+110
| | | | |
| * | | | Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-263-12/+22
| | | | | | | | | | | | | | | | | | | | and ifdef the functions in qgl.h
| * | | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-2413-68/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Make EglFS plugin compile after changes to QPlatformEGLContextGunnar Sletta2010-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| * | | | 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-2211-26/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on native child widgets. Reviewed-by: paul
| * | | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-225-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-224-28/+35
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouseGunnar Sletta2010-11-191-0/+9
| |\ \ \ \
| | * | | | Add workaround_brokenFBOReadback=true for maliGunnar Sletta2010-11-191-0/+9
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-191465-64370/+91675
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| * | | | | Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629Paul Olav Tvete2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig
| * | | | | 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).
| * | | | | Disable the ./configure -qpa [platform] flagJørgen Lind2010-10-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | also fix what mkspec should be picked up when compiling on mac
| * | | | | Lighthouse: eventloop integration rework.Jørgen Lind2010-10-287-91/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-022-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make QtScript examples compile
| * | | | | Make QtScript examples compileKent Hansen2010-12-022-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assumptions were made that "#include <QtScript>" would pull in the necessary QtCore headers as well, but we shouldn't rely on that.
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-018-30/+147
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGtkStyle: Don't create new GtkAdjustment objects on every draw Designer: Fix coverity warning (memory leak in widget database). Fix license headers
| * | | | | 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>
| * | | | | Designer: Fix coverity warning (memory leak in widget database).Friedemann Kleint2010-12-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Juuso Pakarinen <juuso.pakarinen@tieto.com> Task-number: QT-4341
| * | | | | Fix license headersJason McDonald2010-12-014-10/+91
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-304-41/+47
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: avoid the warning about comparison between signed and unsigned integers QRasterPixmapData: Reuse underlying QImage in fill() if possible.
| * | | | avoid the warning about comparison between signed and unsigned integersKonstantin Ritt2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 951 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | 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
generated by cgit v0.12 at 2025-09-09 17:14:19 (GMT)