summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Added explicit threading API to QtOpenGL.Samuel Rødal2012-11-308-25/+84
| | | | | | | | | | | | | | | | | | | | | | | | Since QtOpenGL/QGLContext is implemented in terms of QtGui/QOpenGLContext which has stricter requirements about how it's supposed to be used, we need to apply these requirements to QGLContext as well. This change adds QGLContext::moveToThread(QThread *) and documents it as a necessity for making a context current on another thread. Also introduces QGLPixelbuffer::context() to access the QGLContext of a pixelbuffer, and made QGLWidget::context() return a non-const QGLContext, since there's no good reason why it shouldn't, and it leads to less const_cast clutter. We could have introduced a backdoor in QOpenGLContext instead, making it loosen its requirements, but that would have made it harder / impossible to fully support threaded OpenGL in all the platforms. Task-number: QTBUG-22560 Change-Id: Ibb6f65f342e7c963e80cc42ab5664c5f1cab30b0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix crash when requesting QGuiApplication::platformNativeInterface()Miikka Heikkinen2012-11-301-1/+1
| | | | | | | | If QGuiApplication has not been instantiated, this function would crash. Change it to return NULL pointer instead. Change-Id: Ia3d27019daa436d5243c9cce757a132d96aae112 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix connecting to a functor with 3 argumentsOlivier Goffart2012-11-301-1/+1
| | | | | | | Task-number: QTBUG-28285 Change-Id: I07bd870c093482035728aa783d0ecbc8aa8670d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revise QMacStyle scrollbar animation handlingJ-P Nurmi2012-11-301-65/+51
| | | | | | | | Skip animations whether styleObject is not set. Task-number: QTBUG-27895 Change-Id: I1d2e4655b735627b672bc85f773605adcd375418 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Remove Qt 3 reference from resource system documentation.Paul Olav Tvete2012-11-301-4/+1
| | | | | Change-Id: I2610cf1d3cda09c84d9b36afa0eab1e20be43410 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* More changes from Nokia to DigiaSergio Ahumada2012-11-303-5/+5
| | | | | | Change-Id: I8f2edd238e64c01d3ccb7c012b389d61435d7135 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtBase: Documentation: Replaced deprecated \oDavid Schulz2012-11-301-4/+4
| | | | | | | ... with \li in documentation lLists. Change-Id: I51f5f4f848ec1b5a379647b32772668c24ff5992 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Fix missing code snippet in QTest doc.Christian Strømme2012-11-302-1/+15
| | | | | Change-Id: I6fb1167634b0acddfa61b92d104d98ba8a1a15cb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add a nice description of Qt Widgets moduleJan Arve Saether2012-11-301-0/+4
| | | | | | | | Since Qt Widgets was moved from Addons to Essensials, take the old description for the Qt Widgets addon and put it in the module. Change-Id: If955747999d48fe09fff00a9c78e38ccbcf9a493 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix Qt Xml docs and generate correct module and index pagesLars Knoll2012-11-303-3/+51
| | | | | Change-Id: I95988798997edeb2d656d265e3172fa0d78db55a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix Qt OpenGL overview.Lars Knoll2012-11-303-33/+118
| | | | | Change-Id: Ib95638a8eb306e5ababa47cc61e1b5db4ae6cb31 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fixes to Qt D-Bus docsLars Knoll2012-11-304-38/+43
| | | | | Change-Id: Ib13dc69edce9b989915e4eb75421e775b173095b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix print support docsLars Knoll2012-11-304-17/+16
| | | | | | | Make sure qdoc generates a correct overview for the module. Change-Id: I6ea95638459201a0bb09f2e645173ade3a36f0e0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixup concurrent docsLars Knoll2012-11-304-8/+135
| | | | | | | qdoc now finds an overview and the concurrent namespace. Change-Id: I2cd15bc19091f53bd2bb98919e685d49d473dbec Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qdoc: Don't include internal items in annotated listsMartin Smith2012-11-292-2/+19
| | | | | | | | | Now things that are marked internal oe whose parent is marked internal won't appear in annotated lists. Task-number: QTBUG-28274 Change-Id: I14ea96e223640cad45e7e4249a3e1fc0642bd9c3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* uic: remove internal QStyle subclasses from qclass_lib_map.hJ-P Nurmi2012-11-291-7/+0
| | | | | Change-Id: I10f0b2198d60f882cd59a03f33b2cc1afb0ffcf5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove trailing white spacesRobert Loehning2012-11-291-1/+1
| | | | | Change-Id: I4ff016476e73870405377f76b13fb2e74749a047 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* doc: Remove references to Qt 4 in QMainWindow introductionEskil Abrahamsen Blomfeldt2012-11-291-6/+5
| | | | | | | Also make it read less as a porting guide from Qt 3. Change-Id: I78f93c643d236e13ba4ef76eeea1a98be4573def Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Make Mac style not crash on null styleObject.Morten Johan Sørvig2012-11-291-0/+14
| | | | | | | | | | | | We generally expect styleObject to be set during style draw calls but this isn't always done, especially legacy code outside Qt (for example in Qt creator). Create a temporary stand-in QObject. This will disable scroll bar animations. Change-Id: I781967fe28f68f5952b368cd56be980b9e270ecd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Cocoa: update OpenGL viewport when nsview movesRichard Moe Gustavsen2012-11-283-3/+35
| | | | | | | | | | | | | | | | | | NSOpenGLContext expexts an -update call whenever the physical position of the view it draws to changes on screen. Since we don't get geometry callbacks for such views when the parent view moves, we need to register a special notification for that case, and tell Qt that we need to repaint the QWindow that the view is backing. This case does not hit very often, but is evident in MDI applications where the subwindows are OpenGL backed QGraphicsView widgets. Dragging the subwindows around produces garbage inside the windows. Change-Id: I1b162470b03cca6ed722c6c54080459f2c5e91d9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mention that the Qt book only covers widgetsGunnar Sletta2012-11-281-0/+1
| | | | | Change-Id: Ieb20f410570496286d670cab48e80f7bf7772338 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove legacy classes from "Painting in 3D" list.Gunnar Sletta2012-11-281-8/+0
| | | | | Change-Id: I099dd940145629a67266d02bde7217ea9fbc9372 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix build when SSE2 is not available.Andy Shaw2012-11-283-1/+55
| | | | | | | | | Although SSE2 support is detected at runtime it still may not be available at build time, so we have to ensure it only uses SSE2 when it is available at build time too. Change-Id: I86c45a6466ab4cec79aa0f62b0d5230a78ad825a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtWidgets docs: use Fusion screenshotsJ-P Nurmi2012-11-2872-55/+55
| | | | | | | | The Plastique style no longer exists in QtBase. All the references have been updated to Fusion, and the obsolete screenshots have been removed. Change-Id: I771a9ecf23b82965c7b3c41a40945cf051cb5f3a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QNX: Fix window focus problems when using QNX 6.5.0.Sergio Martins2012-11-283-0/+13
| | | | | | | | | In blackberry, activation events come through the navigator, but we might not have a navigator. Change-Id: I0d9e1a08336aa403035fdf00be46d839a83f4b58 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make the animation framework docs more framework-agnosticJan Arve Saether2012-11-282-6/+9
| | | | | | | | | * (i.e. do not mention Kinetic) * Add some relevant references to Qt Quick * Refer to QMetaType::Type instead of the obsolete QVariant::Type Change-Id: I82b69250c933c7e54dc0c268fa6ce4379726fb0d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Provide the bundled zlib headers for external accessaavit2012-11-282-2/+10
| | | | | | | | | | | | | | | | | | (Currently, the Qt5 windows packages lack the tiff and mng plugins from qtimageformats because of this issue.) If Qt is configured to use its bundled zlib, it is compiled into QtCore, and the public symbols are exported so that it can be used by other Qt libraries. However, after modularization, this did not work for libraries outside qtbase, since they did not have access to the headers of the bundled zlib. This commit fixes that. Ref. also 1f461ac45bfa8887261510a95fb33a346d68eaba Change-Id: Ie986f47e00fd0c16f2ba04d27f4258a20d61b260 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qdoc: Listing QML group members across modulesMartin Smith2012-11-282-5/+13
| | | | | | | | | | | | | This is a second update, which fixes the "All QML APIs by Module" page, I think. I expect there will be more insifious places where this problem will pop up. qdoc must be dragged, kicking and screaming into the modular age. Task-number: QTBUG-28036 Change-Id: I8dd4733a2b0aac9bab3cb2066b6dbf139a8e98a6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Qnx: Check if QCoreApplication::instance() exists before using QSocketNotifiermfekari2012-11-281-2/+5
| | | | | | Change-Id: I9f00314ea1ef73b87bc56ca1f8fcf859c9cd1824 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Remove Qt 3 references from model/view documentation.Paul Olav Tvete2012-11-281-16/+7
| | | | | | | Also, don't pretend that Qt 4 is new. Change-Id: Ib8f719310059093b31181e3c98cf5c028c3018dc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Move session management code from QApplication to QGuiApplication.David Faure2012-11-287-264/+240
| | | | | | | | | | | | | | QSessionManager was already in QtGui, but not usable since the only API to get to it was still in QtWidgets. Session management isn't related to widgets, it also applies to QML apps on the desktop. The virtual commitData and saveState methods have been removed, given the two signals which exist since 4.2, and an additional isSessionSaving() method was added instead. Change-Id: I8099e70df133303e74456706827da21f013fcc6a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Docs: cleaned up remaining cleanlooks references and screenshotsJ-P Nurmi2012-11-2830-10/+5
| | | | | Change-Id: I671cec2a84eabe14bef788499dbfa7d7e9c27670 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docs: add Fusion Style Widget GalleryJ-P Nurmi2012-11-2829-3/+141
| | | | | | Change-Id: I1eb6548a8842fc141b1506d6070f6b74bda5c893 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Document how to name threads.Mitch Curtis2012-11-281-0/+8
| | | | | | Change-Id: If7a7bf4f54509ebb86ce394d8bb5a7748ef419d5 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed QTestLib tutorial docs (link + outdated mention of Qt Labs).Samuel Rødal2012-11-282-4/+4
| | | | | | Change-Id: I76d45780b052b40b079fb0c8e0d38db88aa17814 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Choose better screenshots for "The Widget Classes" docsJ-P Nurmi2012-11-281-5/+5
| | | | | | | | | Remove references to the obsolete CDE and Plastique styles, choose screenshots from more modern styles, and revise the table so that screenshots in the same column are from the same style. Change-Id: I20d5944ab62d8a6965fb49339dede90624c520b3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Style docs & snippets: remove references to QWindowsStyleJ-P Nurmi2012-11-286-65/+75
| | | | | | | | | QWindowsStyle is being made internal. Use either QProxyStyle for customizing existing styles or QCommonStyle to implement full custom styles. Change-Id: Ic81696abc61a3c012a3775efc0b4fba2e1dab4bb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove invalid assert from QGraphicsSceneRafael Roquetto2012-11-281-1/+0
| | | | | | | | | | | This assert has become invalid since commit 40fef403. After that commit, the 'origin' mentioned by the assert is not necessarily the first item of cachedItemsUnderMouse, since it origin can be reassigned at line 5735. Change-Id: Ibc0739b9fe31be3cc74110225940e9e173f585e0 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Docs: removed Motif widget galleryJ-P Nurmi2012-11-2829-138/+0
| | | | | | | The Motif style no longer lives in QtBase. Change-Id: I7a0d31603a3898c1e5ab558b6e14aac4ec1315bc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docs: removed CDE widget galleryJ-P Nurmi2012-11-2828-133/+0
| | | | | | | The CDE style no longer lives in QtBase. Change-Id: Idfb35e8333b30939a4929418ecf2ce6ccfc437cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: rename qttest.qdocconf to qttestlib.qdocconfhjk2012-11-282-1/+1
| | | | | | | | The name of the .qhp files seems to be generated from the name of the .qdocconf, not the value it has in qhp.QtTest.file Change-Id: I12645cb254991006c920234ec966e2fa220cb595 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtCore: Make more signals private.Stephen Kelly2012-11-2815-40/+108
| | | | | | Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Always use QAIM to get the default flags.Stephen Kelly2012-11-282-3/+3
| | | | | Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-282-1/+4
| | | | | | | | | | | | | | | | | | User applications are those that users run directly, whether it be for development or not. The executable binaries that the user does not usually run but is still required for proper functioning are called "program executables" in Autoconf and they are placed in libexec. This commit adds support for "program executables" in Qt by adding the -libexecdir option to the configures, the qmake variable QT_INSTALL_LIBEXECS (note the plural, to match all other properties), and QLibraryInfo::LibraryExecutables. At the time of this commit, the only expected "program executable" is the QtWebProcess, the WebKit2 helper process from QtWebKit. Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Enhanced QSharedDataPointer documentation with container performance sectionNils Jeisecke2012-11-281-0/+8
| | | | | | | | Added a section motivating the use of Q_DECLARE_TYPEINFO to mark shared data classes as movable types. Change-Id: I26664500aef7d83d779d90f97f3f2b0043966480 Reviewed-by: Casper van Donderen <casper.vandonderen@gmail.com>
* Make "API Reference" section \section1Jan Arve Saether2012-11-281-1/+2
| | | | | | | This is consistent with QtCore and QtSql landing pages. Change-Id: Ibea45678a6952b39d24483bad1ee44f562699d1f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Build fix when building libGLESv2 on Windows with MSVC 2010Andy Shaw2012-11-281-2/+1
| | | | | | | | | Although SSE2 is not used, texture.cpp does not protect calls to these functions, support for SSE2 is checked at runtime so the code needs to be compiled in. Change-Id: Ie14d0ff6b75448e480236d5d30254f107735b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QNX: fix QProcess fd inheritanceRafael Roquetto2012-11-271-3/+18
| | | | | | | | | | Under QNX, QProcess was not inheriting the parent's file descriptors. This patch fills in the fd_map array, containing the file descriptors to be inherited, which is passed to spawn(), accordingly. Change-Id: Ia160abda88c1ffede877301aeae93a97c2b35320 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
* Commented confusing QWriteLocker use in QGLTextureCache::getTexture().Samuel Rødal2012-11-271-0/+1
| | | | | | Task-number: QTBUG-22560 Change-Id: Idd3948455e8415473a407f66b628418c0d87898d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix typo in SSL error message.Friedemann Kleint2012-11-271-2/+2
| | | | | Change-Id: If72d80979e1d2ea909227785cd691be39d75c8ab Reviewed-by: Shane Kearns <shane.kearns@accenture.com>