summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Restore the visibility of a moved QWindow in QWindow::screenDestroyedJocelyn Turcotte2012-11-301-1/+9
| | | | | | | | | | | | | | | | | | | | QWindow::screenDestroyed triggers an move of the window to the primary screen. This causes the screen to be destroyed and shown again on the new QScreen. The issue is that QWindow::destroy() hides the window but create() doesn't set it visible, and this ultimately causes any QWindow to be automatically hidden when their QScreen is destroyed. As stated in the comment, it could be the intended behavior that windows aren't shown automatically on a remaining screen like when using two screens not logically part of the same desktop. Once the platform plugins have access to an API allowing them to adjust the screens of their QWindow, this patch shouldn't be needed anymore. Change-Id: I7628377c969f79f9eebb3deabaf0470542d68a9c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Added explicit threading API to QtOpenGL.Samuel Rødal2012-11-3011-42/+184
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove duplicate libraries added via prl files in WindowsMiikka Heikkinen2012-11-301-0/+17
| | | | | | | | | | | The LIBS statement generated into Makefiles contained duplicate libraries when application was linking static libraries. Fixed by adapting the logic from unixmake.cpp's version of processPrlFiles() to remove duplicates. Change-Id: I12e152900233d0376b7d7ac6cd18a92850a6d640 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix connecting to a functor with 3 argumentsOlivier Goffart2012-11-302-2/+53
| | | | | | | Task-number: QTBUG-28285 Change-Id: I07bd870c093482035728aa783d0ecbc8aa8670d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QtBase: Fix painting example arthur background colorDavid Schulz2012-11-302-5/+40
| | | | | | | | | | | | | | | The arthur style set the background color to a bright color and leave the foregroud color, for example for text, untouched. If you are using a color theme with bright foregroundcolors on your system this will result in unreadable text on push- and radio-buttons. The function drawControl is now reimplemented and the labels with text are drawn with an appropriate color. Change-Id: Ifd7f3a2b1c0305130255009c7733e0966830171a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.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-305-9/+9
| | | | | | 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>
* Doc: Modified CSS according to a graphic designer's recommendations.Jerome Pasion2012-11-302-0/+66
| | | | | | | -Landing page in qtdoc uses the CSS classes. Change-Id: I05efae40d4d6d1802585c129a0a12b2af7eee5e7 Reviewed-by: Lars Knoll <lars.knoll@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>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-11-29306-1050/+367
| | | | | | | | | | | | | it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk <qthjk@ovi.com>
* remove the dependency to QT_BUILD_TREEJing Bai2012-11-291-1/+1
| | | | | | | | | | To fix a build problem when plugandpaint is not built with qt src. QT_BUILD_TREE is not set in this case. We use a relative path instead. Task-number: QTBUG-28261 Change-Id: I2456614070f0849ba9400fbe4b76172189e3925f Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* Add \brief to the examples.Eike Ziller2012-11-29135-138/+138
| | | | | | | | | That is used by qdoc to generate brief descriptions for the example manifests. Change-Id: I142a6d3259f90d0c9990033b3c36e139062ac343 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <qthjk@ovi.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>
* fix bootstrapped buildOswald Buddenhagen2012-11-291-2/+2
| | | | | | Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qttools/d9dc9d34ec092ddc536a907b4f5009fb8bf01da4)
* 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>
* Style auto tests: kill QWindowsStyle dependenciesJ-P Nurmi2012-11-282-46/+51
| | | | | Change-Id: I135fe2b0aae81c73c1cca6272f71db07ecb3fa6b Reviewed-by: Lars Knoll <lars.knoll@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>
* factor out qt_docs_targets.prfOswald Buddenhagen2012-11-283-54/+53
| | | | | | | | | instead of letting *every* qmake-based project have recursive docs targets, let qt modules "subscribe" to it explicitly by having load(qt_build_config) in their .qmake.conf (which they already do). Change-Id: I97b74591fd0c4bd5f8b08c5f550df9c7eef2f556 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* fix non-qmake build of the evaluatorOswald Buddenhagen2012-11-281-1/+1
| | | | | | Change-Id: Ibbd00b415318bda928b5e6f9831b214e2657e291 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qttools/769fa282ac8a4b98698dada6969452363e0eb415)
* re-enable coloreditorfactory and stardelegate examplesOswald Buddenhagen2012-11-281-1/+3
| | | | | | Change-Id: I99b1a1967973ea28acd9e37c922f96e9dca8875d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* reformat assignment to ease later modificationOswald Buddenhagen2012-11-281-5/+7
| | | | | Change-Id: Ib8741baf678583fe56ea0f0a5d4cf2ee22b21b3a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* dbus-chat => chatOswald Buddenhagen2012-11-287-1/+1
| | | | | | | to make the source and install locations consistent Change-Id: Ifde8748eeab843b06bf79f941fa4789b5b68cca9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove rather useless text fileOswald Buddenhagen2012-11-281-4/+0
| | | | | | | somebody who cares can find the information in the git log Change-Id: I97dff4ab33a773247e1320ba6491e6377a2b94e7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove apparently unused fileOswald Buddenhagen2012-11-281-8/+0
| | | | | Change-Id: Ie8b60b9e63c5783674cbac3bbe277f58d3059ea3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove meaningless OTHER_FILES assignmentsOswald Buddenhagen2012-11-282-6/+0
| | | | | | Change-Id: Id3d5690d5b174e5374332158709365ab431f660b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* README.txt => READMEOswald Buddenhagen2012-11-281-0/+0
| | | | | | | use the same naming everywhere Change-Id: Ic9106a17eb0979278f12f2ea2b7c1a04bc448745 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* delete .desktop files of examplesOswald Buddenhagen2012-11-28219-2409/+0
| | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I27e2c35375e28645b0c03449ddc7ac7017da5943 Reviewed-by: Jerome Pasion <jerome.pasion@digia.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-283-5/+17
| | | | | | | | | | | | | | | | | | (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>
* Fix -largefile option in configureLucas Wang2012-11-281-0/+4
| | | | | | | | | | -largefile is regarded as a library named argefile and added to Makefile as a link flag. It will cause a link error. Change-Id: I8ac30896d4e473f7e98c937c8906b1b9c620cf1e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 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>