summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Change the default value of QSortFilterProxyModel::dynamicSortFilterStephen Kelly2012-01-023-4/+1
| | | | | | | | | | The value is changed to true. It is a common bug that developers expect this proxy model to reflect the source model when the source changes. That requires setDynamicSortFilter(true), so we change the default to optimize for the common case. Change-Id: I9bf7efdbda10309fa77aed9391c33054aaae4a29 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Added multi-screen support to hellowindow example.Samuel Rødal2011-12-063-9/+36
| | | | | Change-Id: I025de342952bffeffa0705eb4cfcf869f32241cc Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added rotation animation to paintedwindow example.Samuel Rødal2011-12-013-23/+141
| | | | | | | This serves as a useful test case for the QScreen orientation API. Change-Id: I009ebd8b6d345453620420d84f3ff9d2d2e2663e Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Polish the HelloWindow example.Friedemann Kleint2011-11-283-3/+7
| | | | | | | | - Add window menu (enabling the close button on Windows) - Query threaded Open GL capability. Change-Id: I938f154e242dba584e2f597ac44294ab5d3b7141 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added command line argument to make hellowindow example single window.Samuel Rødal2011-11-211-19/+25
| | | | | | | | Useful when testing on embedded platforms with no support for multiple top-level windows. Change-Id: I212ca69c3f5d5d338e860169b14e3f9f3951712b Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Compile fix for Mac OS X 10.7 with 10.6 sdkAndy Shaw2011-11-181-2/+2
| | | | | | | | | | | | | Since it is an example it is cleaner to just include the header file as it will be available on other platforms anyway. Also ensured that the Qt includes were first before the system ones. Task-number: QTBUG-22641 Merge-request: 1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 4fffdabc948ff6afc6008d4cb723a6a2e10eef79) Change-Id: I4fffdabc948ff6afc6008d4cb723a6a2e10eef79
* Assign function argument to class member, not to itselfBradley T. Hughes2011-11-091-1/+1
| | | | | | | | | | | | | | The 'worker' function argument shadows the class member of the same name, and 'worker = worker;' assigns the function argument to itself, not to the member as intended. examples/tutorials/threads/movedobject/thread.cpp:69: warning: explicitly assigning a variable of type 'QObject *' to itself [-Wself- worker = worker; ~~~~~~ ^ ~~~~~~ Change-Id: If4adf486a86a4ba4e7f7040a7771a70b7dd9aa86 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* qtbase/examples: Add options to standarddialogs example.Friedemann Kleint2011-11-072-49/+133
| | | | | | | | | | | | Categorize dialogs using a toolbox and add an options groupbox for dialogs that have options flags. Besides example usage, this allows people implementing platform native dialogs to play around with the options. Change-Id: Icc0fd00382332b11783271ef15a0583c18758784 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Reimplement GLTexture::failed() properly in GLRenderTargetCubeBradley T. Hughes2011-10-311-1/+1
| | | | | | | | The GLRenderTargetCube::failed() method needs to be const. Change-Id: I9bfa031e284b62c86a9be786aea3b851582b71f4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Re-added hellogl_es and ES 1 support for QOpenGLContext.Samuel Rødal2011-10-317-0/+482
| | | | | Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Examples, plugins: Remove remains of qpa in profiles.Friedemann Kleint2011-10-283-14/+6
| | | | | Change-Id: I0fc45c6c4df6d1f07472aec30b9e64b55db8e543 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Get rid of legacy glTexParameterf calls.Samuel Rødal2011-10-282-8/+8
| | | | | | | | | | | ES 1.0 didn't have glTexParameteri, which is why we sometimes used glTexParameterf. However, we shouldn't use glTexParameterf because that's treating integer values as floating point, which is not type safe. ES 1.1+ and ES 2.x have glTexParameteri, and we don't really care about supporting ES 1.0 in any case in Qt 5. Change-Id: I6b586b31ddc418ba319c4cc88f6bb3978fdbd040 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Deprecate QDesktopServices::storageLocation/displayNameDavid Faure2011-10-231-2/+2
| | | | | | | Which required porting the related unittests to qstandardpaths Change-Id: I6eb63c46845f05cd29cc42b59872707526277c90 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
* Fix compilation on HarmattanSimon Hausmann2011-10-211-9/+3
| | | | | | | | Commit 87274e272d2a854563066489e20d019b4e6320de removed the maemo "specific" bearer monitory example .ui file, but the .pro file wasn't updated. Change-Id: I9daa000fe3e4b69789519f53541c106d01748ffd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix FTP example to handle failure to open network sessionShane Kearns2011-10-202-24/+35
| | | | | | | | | | | | | | | | The example code only dealt with successful opening of the session. If the session open failed, the application is stuck because the connect button is disabled. Moved the session open to be part of connection. Handled session open failure by puttin the UI back in the default state where connection button is enabled. Task-Number: QTBUG-9909 Reviewed-By: Miikka Heikkinen (cherry picked from commit 104c22a68c422152ff3cf03eb3615e7826fefbd0) Change-Id: Ifa40fcd8b83c43cda364b3ec5e58f80b539aa244 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* QtBase examples: Remove Maemo/Symbian-specific code.Friedemann Kleint2011-10-18501-4019/+26
| | | | | | | | | | | | | | | - Maemo/Symbian are no longer supported and QWidget-based examples are no longer supposed to run on mobile platforms, so, remove any Maemo/Symbian or mobile-specific code from source files and profiles. - Remove Maemo/Symbian vibration examples. - Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate. Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Clean-up a macro for CocoaMorten Sorvig2011-10-102-70/+0
| | | | | | | | | Remove the usage of Q_MAC_USE_COCOA and Carbon code paths. Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112 Reviewed-on: http://codereview.qt-project.org/5100 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Added Orientation API to QScreen and QWindow.Samuel Rødal2011-10-072-4/+44
| | | | | | | | | | | | QScreen now has a primary and current orientation, and a QWindow can set its orientation as well. The current screen orientation is just a hint to the application. Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4 Reviewed-on: http://codereview.qt-project.org/5988 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Get rid of the last traces of QMimeSourceLars Knoll2011-09-291-0/+1
| | | | | | | | | | | The class has been deprecated since Qt 4.0, but couldn't be removed as QDropEvent inherited from it. Change-Id: I9caa19b30977a319e79255900dee8b2425783f46 Reviewed-on: http://codereview.qt-project.org/5754 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Make examples build with Qt-in-namespaceKent Hansen2011-09-283-0/+6
| | | | | | | Change-Id: Ie4710b8f3afb44191927bab94eb47e00207cb831 Reviewed-on: http://codereview.qt-project.org/5684 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix compilationLars Knoll2011-09-192-1/+2
| | | | | | Change-Id: I6eec01349126393183ec8df99a50f96c192ee0c2 Reviewed-on: http://codereview.qt-project.org/5099 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Get the 'dockwidgets' example to compile.Jason Barron2011-09-151-1/+1
| | | | | | | | | Required printersupport. Change-Id: Idd525e847f793631b70204d25c4fc949279801bf Reviewed-on: http://codereview.qt-project.org/4915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add missing license headersJason McDonald2011-09-159-0/+360
| | | | | | | | | Examples get the BSD license header. Change-Id: I4802cc00815c69e2f113aa8973d61203357212e3 Reviewed-on: http://codereview.qt-project.org/4849 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-1316-948/+0
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge branch 'refactor'Gunnar Sletta2011-09-13751-1821/+1584
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * Fix compilationLars Knoll2011-09-121-2/+2
| | | | | | | | | | | | Change-Id: I0b562f810bc12e728f59976ad8467a5ce9fd9bec Reviewed-on: http://codereview.qt-project.org/4666 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Improved and made public the QOpenGLPaintDevice API.Samuel Rødal2011-09-083-92/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The new API is more flexible, allowing the use of QOpenGLPaintDevice with any QOpenGLContext, and putting more responsibility on the user for ensuring the correct FBO is current (the user knows best anyhow). Task-number: QTBUG-21263 Change-Id: I50b954125f552baef52fbb3fe2ed907a11ad519c Reviewed-on: http://codereview.qt-project.org/4325 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * Fixed hellowindow making context current in wrong thread.Samuel Rødal2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | Make the context a child of the Renderer, which is already moved to the correct thread. Change-Id: Iafda090e15b322c03e2c10b1905050f636b90197 Reviewed-on: http://codereview.qt.nokia.com/3915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-08-311-1/+1
| |\
| * | Copy core GL functionality to QtGui with QGL -> QOpenGL naming.Samuel Rødal2011-08-298-29/+228
| | | | | | | | | | | | | | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Temporarily disable printers on Windows, fix export.Friedemann Kleint2011-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: I351692b53cf559cd3be64cec8907bd544ba41593 Reviewed-on: http://codereview.qt.nokia.com/3653 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
| * | Fix building of examples.Friedemann Kleint2011-08-2524-16/+38
| | | | | | | | | | | | | | | | | | Change-Id: Iebb56c81fd13deaa82d8883e3f1529f1a78ebea8 Reviewed-on: http://codereview.qt.nokia.com/3603 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Merge branch 'master' into refactorGunnar Sletta2011-08-252-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
| * | | make 'make install' installPaul Olav Tvete2011-08-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I766e7917f6362b1f9cc26d18381e8d76eaf6ff83 Reviewed-on: http://codereview.qt.nokia.com/3261 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Make the hellowindow example multi-threaded to stress the GL backend.Samuel Rødal2011-08-193-28/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e158c0889b050f9ed76ea21176102fc792eef83 Reviewed-on: http://codereview.qt.nokia.com/3150 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * | | Move printing into it's own libraryLars Knoll2011-08-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | Use the paged paintdevice in the print() method of QTextDocument.Lars Knoll2011-08-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to be able to move the printing system into it's own library. Change-Id: If70a55be4c4413f9cd917a30d1b368f32c1145e4 Reviewed-on: http://codereview.qt.nokia.com/3207 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | Build fix after setPreferredPaintEngine was removedPaul Olav Tvete2011-08-171-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f Reviewed-on: http://codereview.qt.nokia.com/3083 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Get rid of OpenGL 1.x engine and platform code from QtOpenGL.Samuel Rødal2011-08-1611-1022/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390 Reviewed-on: http://codereview.qt.nokia.com/3006 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-033-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| * | | | Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-254-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | | Build fix for examples.Friedemann Kleint2011-07-252-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096 Reviewed-on: http://codereview.qt.nokia.com/2095 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-2131-3/+1203
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
| * | | | | Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-1222-50/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
| * | | | | | Remove multimedia subdir from examplesOlli Werwolff2011-07-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I099c5a8785798a41968ec2793384ee58ac0fde39 Reviewed-on: http://codereview.qt.nokia.com/1269 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | | | | Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-0643-820/+110
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
| * \ \ \ \ \ \ Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-27387-1/+32582
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
| * | | | | | | | Reintroduce QWindow::SurfaceTypeMorten Sorvig2011-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Cocoa it makes sense to distinguish between the two window types. Reviewed-by: Samuel
| * | | | | | | | Made QExposeEvent public and added exposeEvent() in QWindow.Samuel Rødal2011-06-222-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for applications that use QBackingStore directly.
View Lorry Controller Status