summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Docs: Moved mainwindow example's image do correct locationOliver Wolff2012-11-301-0/+0
| | | | | Change-Id: Idc22e18aa73fed293f629bdccc438567298f1274 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Adding empty tags in the HTMLJerome Pasion2012-11-304-11/+2
| | | | | Change-Id: I7251b77b645a2085d25443826aa2b9550a373d88 Reviewed-by: Martin Smith <martin.smith@digia.com>
* changes-5.0.0: SC incompatible change - internalized QStyle subclassesJ-P Nurmi2012-11-301-0/+14
| | | | | | Change-Id: I06147f9774797c96efeaada7e0c134a769d28cdd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Replace two \returns markers by "The function returns"hjk2012-11-302-3/+3
| | | | | | Change-Id: I101310f6bd9bddf0ee9d06a81b9fef805313a015 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Mention the QT_STYLE_OVERRIDE env variable.Shawn Rutledge2012-11-301-1/+3
| | | | | | | | IMO we need to have a list of all the environment variables somewhere, but this one is especially useful and wasn't documented at all. Change-Id: I2de09194c5904a9a27066604840ec4be66574fb7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Not necessary to assign bool to false for changing just 2 lines afterMontel Laurent2012-11-301-3/+2
| | | | | Change-Id: I4ed9a07e3dc2cac9d82b3070a2dd22cca2d80f3d Reviewed-by: David Faure <david.faure@kdab.com>
* Fix memory leak. PrinterDialog is not deleted when close itMontel Laurent2012-11-305-14/+16
| | | | | Change-Id: I9f0a300cdaf9803bc2ad723946ac4d0f825cc28b Reviewed-by: David Faure <david.faure@kdab.com>
* Add more qtbase implictly-shared classes to the listGiuseppe D'Angelo2012-11-3023-1/+26
| | | | | | | QText*Format and QDns* ones are still missing. Change-Id: I8e87fba596e87289ca935717e0a90bfc0b0a26c0 Reviewed-by: hjk <qthjk@ovi.com>
* Add QText*Format classes to the list of the implicitly shared onesGiuseppe D'Angelo2012-11-301-0/+7
| | | | | Change-Id: Iee0ecb1cf02fdf9dbdf8328bbe60b1dc7ca21894 Reviewed-by: hjk <qthjk@ovi.com>
* Add QDns* classes to the list of the implicitly shared onesGiuseppe D'Angelo2012-11-301-0/+5
| | | | | | Change-Id: I29dd678a51dc693285c389f235d748120ca58fe1 Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org> Reviewed-by: hjk <qthjk@ovi.com>
* Fixed compatibility problem with ExceptionhandlingHolger Ihrig2012-11-301-1/+1
| | | | | | | | | | | When QtBase is compiled with Exeptions it was incompatible with the other modules compiled with QT_NO_EXCEPTIONS. This resulted in a linker error with ExceptionStore::throwPossibleExceptions, one time returning a const value and the other time without it Change-Id: I0e0dff61aceeec3cfde119b00ed15f3aa9f12659 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Moving the remaining variables assignments from .qmake.cache to qmodule.priAlexey Pavlov2012-11-301-3/+4
| | | | | | | | | | Moving variables to qmodule.pri allows to build all qt modules with user defined command line arguments passed to configure script. Task-number: QTBUG-27566 Change-Id: Ifa7991e9024df3fb4b1fd6536ee0d19b7c63d15e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't link qtmain.lib when using idcidl.prfJoerg Bornemann2012-11-301-0/+3
| | | | | | | | QAxServer projects must not link qtmain.lib. This awful hack was adapted from the old qaxserver.prf Change-Id: I78b4cbf6714bfbd88341449b9230f1989cff8a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Added custom flags for enabling dependencies of other parts to toolsMiikka Heikkinen2012-11-301-0/+3
| | | | | | | Introduced CONFIG flags examples_need_tools and tests_need_tools. Change-Id: I4789d05f6bc0a63c75340c3b3e2aecde18c42c20 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* WINCE: Don't build angle by defaultAndreas Holzammer2012-11-301-1/+2
| | | | | | | | | | | | When having a directx sdk, angle does get auto enabled for all windows platforms. Windows CE directx builds on top of opengl es 2, so if there is directx, there is also a opengl es 2. So don't add more layers of indirection for Windows CE. As well angle does not build for Windows CE. Change-Id: I211a1de29431cd05d5cd60188f503d2cd299c9b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* expose a little less of the build host's file system structureOswald Buddenhagen2012-11-301-2/+5
| | | | | Change-Id: I6fc675b9aeae0744c3308cd20ffd8c115c271c58 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* fix harfbuzz header install locationOswald Buddenhagen2012-11-301-3/+1
| | | | | Change-Id: I2e02f6c80ed7b1df00ad74a3e301997ba3bbd566 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove another pointless indirectionOswald Buddenhagen2012-11-301-2/+2
| | | | | | | | we directly expand $$TARGET on the same line, so just do the same with $$VERSION Change-Id: I3601bfcc835b13f63dce43d00cfe8d34ded60b21 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove unnecessary indirectionOswald Buddenhagen2012-11-301-2/+2
| | | | | | | we are assigning QT.*.VERSION from VERSION a moment earlier Change-Id: Ie4d51f8835b8050755bc399a1a597967c8e3e499 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* make it possible to name include dir differently from library nameOswald Buddenhagen2012-11-304-18/+20
| | | | | | | ActiveQt needs that Change-Id: Ib9f69d19e8042c1ab0f211eebb9237bc2fb77aa3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* don't install headers into Qt/ any moreOswald Buddenhagen2012-11-301-12/+2
| | | | | | | this should have been part of 656e0d342. Change-Id: I56e5d743a756e9236759595429de85754593638e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Docs: revise QApplication snippetsJ-P Nurmi2012-11-301-15/+17
| | | | | | Change-Id: Ibbd31736154af6dd009d331578f9addc4de76e89 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix broken links in the QtWidgets examples.Gunnar Sletta2012-11-303-2/+2
| | | | | | | | I remove the widgets examples from the gui docs as they will introduce broken duplicates (under doc/qtgui/...). Change-Id: I54255ceaf4187477da3e82f6809be41fb98378a2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix linking in painting, richtext and desktop examplesGunnar Sletta2012-11-3021-3/+101
| | | | | Change-Id: If08b2c3366610f74201ab6736f216f1a7d29b3c7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QGV: set QStyleOption::styleObject for graphics items & widgetsJ-P Nurmi2012-11-303-0/+14
| | | | | | | | | | | Certain QStyle code paths expect the style object to be set. This will avoid problems when QGraphicsItems/Widgets utilize QStyle for drawing. Even if things will not necessarily animate properly, such legacy code won't cause a crash at least. Change-Id: Ic77cb4ee9820d6c4ec92c7278fd87cb866f5a780 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Docs: clarify availability & platform theme usage in widget galleriesJ-P Nurmi2012-11-304-7/+20
| | | | | Change-Id: Id3c1e278d6a6ce6c67b7f73c3a9490cf83eb0466 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Made QWindowsStyle internalJ-P Nurmi2012-11-3014-114/+115
| | | | | | | | | | | | | | | We will take this opportunity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy, pluginizing etc. without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QWindowsStyle directly. Change-Id: Ic17c7e425535bc5bb3a08620e9059bb0aea5185e Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Add a way to not generate INCLUDE_DIRS variables.Stephen Kelly2012-11-301-0/+5
| | | | | | | | | | ActiveQt needs this, and it sets the no_module_headers flag. We still need to set the include_dirs variable in the no_module_headers case, so that its dependencies are added to it. Change-Id: I2cad5ee792eed51d36b7c8e2c616763516a5fc10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* doc: Add touch input examples to correct groupEskil Abrahamsen Blomfeldt2012-11-302-0/+4
| | | | | | | Make them appear in list of touch input examples. Change-Id: Ia5f489e28771f0a272da9ec7b61de186ca305e36 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Docs: fix code snippet paths in xml-processing.qdocKevin Krammer2012-11-301-4/+4
| | | | | | | | Configuration file's exampledirs variable already contains the xml sub directory, snippet paths are relative to that Change-Id: I627aebade224afdb7bd38f2b1a089a747e49fabf Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add few missing entries to the changelog related to QObject and mocOlivier Goffart2012-11-301-1/+5
| | | | | Change-Id: I96fa72f1a0669f0899e8079b214cac54e5d6edef Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix path in qtxml.qdoconfKevin Krammer2012-11-301-1/+1
| | | | | | | | | ../../../examples/xml/src doesn't exist, it is ../../../examples/xml/doc/src Change-Id: I08f0d6d91b2cea7bf313cbcdd50632835e21ae24 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Doc: Removing entry in CSS for adding icons to HTTP linksJerome Pasion2012-11-301-10/+0
| | | | | | | | | | This is a temporary solution to QDoc bug https://bugreports.qt-project.org/browse/QTBUG-28307 The links will not have the icon. Change-Id: Ib81bcc9c55cd5f403c85fdd38c0ee71219091e76 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* make minimalegl plugin compile without QtWidgetsTasuku Suzuki2012-11-301-1/+0
| | | | | Change-Id: I060ea584dd78e5f389010ab007567aed11793c23 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Remove reference to Qt 3 documentation from example qdoc code.hjk2012-11-301-3/+1
| | | | | Change-Id: I0999b24f12ee4c878fc2a95b171474eea7a55ba5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix docs for Drag and Drop examplesPaul Olav Tvete2012-11-304-22/+24
| | | | | | Change-Id: Ic1622b64603f7634b697bd7d8412dcc9f1a8c3fa Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix path to style/offline.css in qt-module-defaults.qdocconfhjk2012-11-301-1/+1
| | | | | Change-Id: I203cca8041c44116bef7021837ad21bd85e86b4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QPA: update backingstore also when moving QWindowsRichard Moe Gustavsen2012-11-301-1/+3
| | | | | | | | | | | | | When moving QMdiSubWindows that contains native widgets (e.g QGLWidget) inside a QMdiArea, garbage is drawn to the screen. The reason is that since we use native QWindow backed widgets, QPA will assume that it does not need to update/scroll the backingstore. But since the backingstore can be shared among several windows, we need to do this to ensure that exposed areas behind the moved QWindow will be updated. Change-Id: I35f4d4069a73ab6cd6d610e25c176c752789a927 Task-number: QTBUG-26162 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* 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>