summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Examples: Add Q_DECL_OVERRIDE to overridden functionsOlivier Goffart2014-07-15195-740/+740
| | | | | | | | | | | | | | | | | | Q_DECL_OVERRIDE (which expands to 'override' for supported compiler) helps to declare the intent (that it is an overridden function) and force compilation error when there is no such virtual function in the base class. The examples should show the best practice of having it, as it may save the programmer quite some time in case of change of API or typo in the function name or arguments. This change was done automatically with clang-modernize -add-override -override-macros And fixed MSVC compilation by removing inline for TorrentViewDelegate::paint Change-Id: Ice66ae93fae571266f908703d5b8892b2c1ebb1a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-106-0/+0
|\ | | | | | | Change-Id: Ia12ffdb27ecdf25c2a2bdb0eed1945387502108a
| * Doc: moved saxbookmarks example filesNico Vertriest2014-07-092-0/+0
| | | | | | | | | | | | | | | | | | Moved to qtbase/examples/xml/saxbookmarks Png and qdoc file. Updated qtxml.qdocconf accordingly. Change-Id: Iafe50a09aee22f518adf9ec2ebf289e766e24ff4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: moved streambookmarks example filesNico Vertriest2014-07-084-0/+0
| | | | | | | | | | | | | | | | Moved to qtbase/examples/xml/streambookmarks. Files: qxmlstreambookmarks.qdoc and png files Change-Id: I6edf975f1e0666a4283e65c933d31923695f8b4c Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-031-7/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/accessible/qaccessiblecache_mac.mm src/gui/accessible/qaccessiblecache_p.h src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/kernel/qwidget_qpa.cpp Manually moved change in qwidget_qpa.cpp to qwidget.cpp (cd07830e3b27da7e96a0a83f91ba08c168b45e62) Change-Id: Ia51f471f9b53de2f3b07d77ea89db9303ac8961d
| * Address Book example: Fix QTableView column sortingTopi Reinio2014-07-021-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | Rearrange the code so that QTableView::setSortingEnabled() is called after setting up the sort filter. This ensures that new entries added to the model always follow the column header's sort order. Task-number: QTBUG-39585 Change-Id: Iaec8aa9342981817a019473ba12bad52cdbdfbb8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-018-57/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/network/socket/qnativesocketengine_winrt.cpp src/plugins/platforms/android/androidjniaccessibility.cpp src/plugins/platforms/windows/qwindowswindow.cpp Manually adjusted: mkspecs/qnx-armle-v7-qcc/qplatformdefs.h to include 9ce697f2d54be6d94381c72af28dda79cbc027d4 Thanks goes to Sergio for the qnx mkspecs adjustments. Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
| * Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-144-34/+70
| |\ | | | | | | | | | Change-Id: Icd073d40ce10ab4733b997036815795dd3fbaac1
| | * Polish the image viewer example.Friedemann Kleint2014-06-124-34/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Open files passed on the command line. - Point the file dialog to the pictures location and use a filter string for the supported types. - Set the window title according to file name. Task-number: QTBUG-37203 Task-number: QTBUG-39287 Change-Id: I4e5e43875c3a7544c862c054181e75942939c1d5 Reviewed-by: David Faure <david.faure@kdab.com>
| * | Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-112-2/+2
| |\| | | | | | | | | | Change-Id: I147a75ac74bd7b19dbeb99e1ec2836cc5bfc2806
| * | Doc: Updated Layout examples.Jerome Pasion2014-06-104-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -added links to and from the overviews. -added information on how to run the example. -updated copyright. Task-number: QTBUG-33597 Change-Id: Ib049cb94f136caa6916878959ae830248bd236b5 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* | | Disable some more qtbase examples for dynamic gl buildsLaszlo Agocs2014-06-303-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Examples using OpenGL 1.x cannot be migrated. Therefore, similarly to ES builds, we just disable them. Change-Id: I76e888d2ecfb2582ae35853d9dcdd0cb686fddc6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-058-9/+60
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| * | fix qmaccocoaviewcontainer exampleOswald Buddenhagen2014-06-052-2/+2
| |/ | | | | | | | | | | | | | | - fix build on 10.6 - actually build it at all Change-Id: Ib929f8b56e55f00191f7fcfb2be25975e46a1af2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * doc: Updated Qt D-Bus Examples.Jerome Pasion2014-05-286-7/+58
| | | | | | | | | | | | | | | | | | | | -transferred group page from qtdoc repository -added description in example pages -set the example documentation to use the standard Qt thumbnail -added an entry in the help index for the example page Change-Id: I9d5747bc329b5ecc15acd2eb3139696931166c6f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | simpletreemodel example: rename parent() to parentItem() for clarityDavid Faure2014-05-253-18/+18
| | | | | | | | | | | | | | | | | | | | I show this example during trainings, and parent() is too much like QObject::parent(), QModelIndex::parent() and our model's parent() [which calls this method], so it's less confusing if this is called something clearer like parentItem(). Change-Id: I101342051349d94c4a3bc3d4bc332194d6779293 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add a menu item to mainwindow example to toggle unified toolbars.Jake Petroules2014-05-211-0/+9
| | | | | | | | | | Change-Id: Id7d7433849565b1acfc690cf5e23e8105c6af993 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Use the new unified toolbar implementation in examples on OS X.Jake Petroules2014-05-123-0/+12
| | | | | | | | | | Change-Id: Ica3476d16a4baab1f75e253eb406505f88018d47 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Wiggly example: Modernize/compactify codehjk2014-05-123-24/+13
| | | | | | | | | | | | Change-Id: Iacfb308baac8eea60d56bf559113b36acb79d82a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix up examples for dynamic opengl buildsLaszlo Agocs2014-05-124-8/+15
|/ | | | | | Change-Id: Id311b00fe7783a3175dc1c4a38f627c78c470761 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Update AddressBook ExampleSteven Ceuppens2014-04-283-3/+3
| | | | | | | | | | Adding parent to QDialog As proposed on qt-project.org forum: http://qt-project.org/forums/viewthread/41686/ Change-Id: Ib66d24e4afd0be803a1080c37bc6c0a189844786 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* purge vestiges of opengl es 1 supportOswald Buddenhagen2014-04-0410-483/+9
| | | | | | | | amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Updated outdated README for thread examplesKai Koehne2014-03-311-8/+6
| | | | | | Change-Id: I3fa8ac350dc89546793d49a31cc5a152c1f55958 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Polish the image gestures example.Friedemann Kleint2014-03-285-34/+138
| | | | | | | | | | | | | | | | | | - Add a command line parser to properly evaluate help option and directory argument, add options to disable gestures. - Add logging category so that the user can actually see what is happening. - Scale large images. - Use qreal instead of float. - Minor polishing: set window title, position file dialog at pictures location. Task-number: QTBUG-37759 Task-number: QTBUG-37203 Change-Id: Ibaf54a13034b150386a8aee476f83a9eba298298 Reviewed-by: Indrajit Tapadar <indrajit.tapadar@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Move IPC example documentationTopi Reinio2014-03-277-0/+210
| | | | | | | | | | | | Examples under examples/ipc were not part of any module documentation. This change adds the above folder to Qt Core documentation, and moves the corresponding files so that the example documentation is built correctly. Change-Id: If1f34ce7ef04a02df8a87f820bb2e68ffa723dd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Remove empty and duplicated fileSergio Ahumada2014-03-271-31/+0
| | | | | | | | | | This example already exists under examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc Change-Id: If50efa704fb29ed111d6d589ea74cd2575131372 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Save using a window-modal sheet on Mac OS X.Morten Johan Sørvig2014-03-201-3/+8
| | | | | | Change-Id: Icd150787f9ff0878fafd459b3741d1b1e008f8bc Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix compiler warning in exampleKai Koehne2014-03-201-1/+1
| | | | | | | | | | | | | Fix warning main.cpp:160: warning: no return statement in function returning non-void [-Wreturn-type] } ^ Change-Id: I4b74e8f56136077ef9a71b803d2756394fcd7658 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use QCommandLineParser in example dnslookup.Friedemann Kleint2014-03-152-55/+136
| | | | | | | | | | | Show how use QCommandLineParser with additional parameter checking for custom options and positional arguments. Also explain how to display help in GUI applications. Change-Id: I03513e09b7dd5b150259593da0af2ef2a281cab2 Reviewed-by: David Faure <david.faure@kdab.com>
* contextinfo: Make it more responsive and improve error handlingLaszlo Agocs2014-03-141-2/+7
| | | | | Change-Id: If05cd906edc8b7f1fd4744d8d0a392aeec46a454 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* contextinfo example: Print the format() both for context and surfaceLaszlo Agocs2014-03-142-15/+30
| | | | | | | And make the output a bit nicer. Change-Id: I5f0f82374b6e9f9feca70a60c30967adb35d48ec Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Remove calls to setlocale in QtOpenGL cube example.Friedemann Kleint2014-03-141-7/+0
| | | | | | | | | | | | This is causing compilation errors on some Windows CE configurations: mainwidget.cpp(130) : error C3861: 'setlocale': identifier not found mainwidget.cpp(149) : error C3861: 'setlocale': identifier not found Change-Id: Ie863cd7c9c53cfef4074dabffe157d9068654a1c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Doc: correction link, example and parameter issues qtbaseNico Vertriest2014-03-102-1/+1
| | | | | | | | | | | | | Moved codecs folder to qtbase/examples Corrected quote in dropsite.qdoc Replaced snippet statement by include statement Added doc for undocumented parameters Task-number: QTBUG-34749 Change-Id: If4de95b8d39e5680fd0f63f8d2b6685a4b0a8052 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Build the cube opengl example both for desktop and ESLaszlo Agocs2014-03-071-2/+2
| | | | | | | | | No reason to restrict it to desktop only, the code works on ES2 too. Task-number: QTBUG-35730 Change-Id: I915a88cbf3c95a941d6bafd88ed57fef0b6a25b9 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Do not attempt to open multiple windows in hellowindow on embeddedLaszlo Agocs2014-03-061-2/+3
| | | | | | | | | | Platforms like eglfs will not allow opening more than one OpenGL-based window. To prevent aborting the hellowindow example when invoked without --single, enhance the capability check to include also WindowManagement in addition to ThreadedOpenGL. Change-Id: I147d90b31d9fd94912c36339d36af3f311aaa874 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix warning about unused memberJędrzej Nowacki2014-03-061-2/+1
| | | | | | | sub-attaq/boat_p.h:134:9: warning: private field 'key' is not used [-Wunused-private-field] Change-Id: I3f4cb1325aaac71d2bf0e7807381742937d173f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* CustomSortFilterModel example: fix build with QT_NO_CURSORAndrew Knight2014-03-061-0/+2
| | | | | Change-Id: Icb40e49365114fedd5f1ef118dbd61ff2c413863 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Extend QOpenGLFunctions with GL1 functionsLaszlo Agocs2014-03-045-21/+27
| | | | | | | | | | | | | | | | | | This introduces the ability to indirectly invoke all common GL1-GLES2 functions via QOpenGLFunctions. The GL1 functions are not yet resolved, since this would not work anyway when linking to an OpenGL implementation directly. However this may change later but that will be a completely internal change without affecting any public APIs. Also migrate some of the opengl examples to use QOpenGLFunctions for everything. Once dynamic GL loading becomes available on some platforms, these examples should continue to function without any changes since they do not anymore invoke any OpenGL functions directly. Task-number: QTBUG-36483 Change-Id: Ie630029651e5a4863a480aac5306edd67ee36813 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Dynamic GL: remove exporting symbolsLaszlo Agocs2014-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Remove the opengl proxy for now. Later it will either be moved into a separate library or replaced by a QOpenGLFunctions-based approach. This means that the -opengl dynamic configuration is not usable for the time being. The rest of the enablers remain in place. The convenience function QOpenGLFunctions::isES() is now moved to QOpenGLContext and is changed to check the renderable type. This is extremely useful since besides supporting dynamic GL it solves also the problem of GL_ARB_ES2_compatibility (i.e. it triggers the real ES path when creating an ES-compatible context with a desktop OpenGL implementation). Task-number: QTBUG-36483 Task-number: QTBUG-37172 Change-Id: I045be3fc16e9043e1528cf48e6bf0903da4fa7ca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Add an example for creating OpenGL contextsLaszlo Agocs2014-02-287-1/+800
| | | | | | | | | | | | | | | | | | | Besides serving as an example for performing OpenGL rendering inside a window container in a way that it works across all GL versions, this is an extremely useful tool for developers and users alike since it allows quick and easy checking of what sort of context a particular driver returns for a particular QSurfaceFormat. NB! Depending on the OpenGL driver, some surprises can be expected. The handling of core/compatibility profiles, the fwdcompat bit, the supported GLSL versions, etc. tend to be somewhat different across the different OpenGL implementations. Task-number: QTBUG-37071 Change-Id: Iae4328e66cd0bb19f74a77fefef93ea5a3221e31 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Replace obsolete types with their newer counterpartsSze Howe Koh2014-02-251-1/+1
| | | | | | | | | This patch ignores: - Docs for obsolete types themselves - Comparisons between new and obsolete types Change-Id: Id9b1e628255113e7c44520abe0f8a4e0db4a283d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix division by zero in hellogl_es2 example.Friedemann Kleint2014-02-241-6/+6
| | | | | | | | Task-number: QTBUG-37027 Change-Id: Id18ee9c44650de9c434a82d3d10cf48e6ba9e78c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Avoid truncation warning in openglwindow exampleLaszlo Agocs2014-02-211-1/+1
| | | | | | | | msvc shows a warning about double -> float truncation. Avoid this. Change-Id: I1b74cf407c81c881df5e95cc7d64a210888595e3 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Dynamic GL switch on WindowsLaszlo Agocs2014-02-142-37/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch introduces a new build configuration on Windows which can be requested by passing -opengl dynamic to configure. Platforms other than Windows (including WinRT) are not affected. The existing Angle and desktop configurations are not affected. These continue to function as before and Angle remains the default. In the future, when all modules have added support for the dynamic path, as described below, the default configuration could be changed to be the dynamic one. This would allow providing a single set of binaries in the official builds instead of the current two. When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are never defined. Instead, the code path that has traditionally been desktop GL only becomes the dynamic path that has to do runtime checks. Qt modules and applications are not linked to opengl32.dll or libegl/glesv2.dll in this case. Instead, QtGui exports all necessary egl/egl/gl functions which will, under the hood, forward all requests to a dynamically loaded EGL/WGL/GL implementation. Porting guide (better said, changes needed to prepare your code to work with dynamic GL builds when the fallback to Angle is utilized): 1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to differentiate between desktop and ES where needed. Keep in mind that it is the desktop GL header (plus qopenglext.h) that is included, not the GLES one. QtGui's proxy will handle some differences, for example calling glClearDepth will route to glClearDepthf when needed. The built-in eglGetProcAddress is able to retrieve pointers for standard GLES2 functions too so code resolving OpenGL 2 functions will function in any case. 2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds, but never "angle" or "opengles2". 3. The preprocessor define QT_OPENGL_DYNAMIC is also available in dynamic builds. The usage of this is strongly discouraged and should not be needed anywhere except for QtGui and the platform plugin. 4. Code in need of the library handle can use QOpenGLFunctions::platformGLHandle(). The decision on which library to load is currently based on a simple test that creates a dummy window/context and tries to resolve an OpenGL 2 function. If this fails, it goes for Angle. This seems to work well on Win7 PCs for example that do not have proper graphics drivers providing OpenGL installed but are D3D9 capable using the default drivers. Setting QT_OPENGL to desktop or angle skips the test and forces usage of the given GL. There are also two new application attributes that could be used for the same purpose. If Angle is requested but the libraries are not present, desktop is tried. If desktop is requested, or if angle is requested but nothing works, the EGL/WGL functions will still be callable but will return 0. This conveniently means that eglInitialize() and such will report a failure. Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will tell which implementation is chosen. The textures example application is ported to OpenGL 2, the GL 1 code path is removed. [ChangeLog][QtGui] Qt builds on Windows can now be configured for dynamic loading of the OpenGL implementation. This can be requested by passing -opengl dynamic to configure. In this mode no modules will link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will dynamically choose between desktop and Angle during the first GL/EGL/WGL call. This allows deploying applications with a single set of Qt libraries with the ability of transparently falling back to Angle in case the opengl32.dll is not suitable, due to missing graphics drivers for example. Task-number: QTBUG-36483 Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-122-4/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444
| * Fix out-of-tree compilation of widget examplesKai Koehne2014-02-112-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 'styles' are only defined in the qt build internals, when the examples are compiled inside a configured Qt source. That's not the case for the examples e.g. in the Qt SDK. (windows is a default style on all platforms, anyway. So I think the check is superfluous in the first place.) Task-number: QTBUG-36655 Change-Id: I7114619efd479408dad99c8514f8e33ddcab7c7c Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-1126-19/+119
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-0726-19/+119
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
| | * Update some more screenshots in qtbase/examples/widgets.Mitch Curtis2014-01-314-0/+0
| | | | | | | | | | | | | | | | | | | | | The screenshots were taken on Windows 7 with the Aero theme. Change-Id: I2517664e25389f4fb87408daec7b720dfb785bf0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Doc: corrected link/example errorsNico Vertriest2014-01-3114-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pro files after move gestures folder Update snippet statements Corrected path in imagegestures.pro Task-number: QTBUG-34749 Change-Id: Icc19908914e36507e412ab63bf0cc2809aa48e17 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:19:25 +0000