summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Always use QAIM to get the default flags.Stephen Kelly2012-11-289-12/+12
| | | | | Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-288-5/+37
| | | | | | | | | | | | | | | | | | 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>
* Examples: move widgets specific "tools" examples to the correct placeJ-P Nurmi2012-11-28204-157/+168
| | | | | | | examples/tools -> examples/widgets/tools Change-Id: I8b9e23c45e07ce5cd9da8f24a9a9f7ae10b2b107 Reviewed-by: hjk <qthjk@ovi.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>
* GV auto tests: kill QWindowsStyle dependenciesJ-P Nurmi2012-11-275-26/+19
| | | | | Change-Id: I6236b7ca23897c5075bef21f5e62fe01f4cfc611 Reviewed-by: Sergio Ahumada <sergio.ahumada@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>
* revamp doc generation targetsOswald Buddenhagen2012-11-273-17/+39
| | | | | | | | | | | | | | - the old docs target becomes html_docs - a new qch_docs target is added. the .qch files end up directly in QT_INSTALL_DOCS, wihout any subdirectories in between - the new docs target invokes html_docs and qch_docs - respective un-/install targets are added as well. note that the install targets don't depend on the build targets, as it's virtually impossible to get the dependencies right throughout the hierarchy. Change-Id: I07a2589db8252371e77cf925c47c4e59fbd1b2ca Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* assign MAKEFILE even in non-subdirs MakefilesOswald Buddenhagen2012-11-271-0/+5
| | | | | | | | | | | | this is necessary for having a clean way to recurse even from leaf makefiles. the location where the variable is written in the makefile is somewhat bizarre, but the code is so convoluted that finding a better place would mean either a lot of duplication or a lot of prior refactoring. Change-Id: I68e4cf7e3814f6c60b2e3421d69775c993dafb23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Added link to Html5 Web Database APINico Vertriest2012-11-271-0/+5
| | | | | | | | Removed trailing whitespace Change-Id: I98e57b23dbd037bea3b9f5f67fee70110207e3e0 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Martin Smith <martin.smith@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>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-271-3/+3
| | | | | | | Task-number: QTBUG-28156 Change-Id: Id6b1cd83155c61b0d3ead2d185b8968511d4a23f Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QGuiApplication docs: clarify that QWidget needs QApplicationJ-P Nurmi2012-11-271-1/+3
| | | | | | Task-number: QTBUG-28076 Change-Id: I2ebbedd1916f472b9517b509f3b5499d93c71d45 Reviewed-by: Jing Bai <jing.bai@digia.com>
* Update the StylePlugin exampleJ-P Nurmi2012-11-272-14/+18
| | | | | | | | | QWindowsStyle will soon become an internal class, inherit SimpleStyle from QProxyStyle. The documentation has been updated accordingly. Change-Id: Ib55f59729e980b93276e9c2903f13b5e46612ac8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix filesToOpen in example manifests.Eike Ziller2012-11-271-2/+2
| | | | | | Task-number: QTBUG-27801 Change-Id: Ibfe1f3f2f3ba9d00698d3465fb0950e77a63bd4e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix touch event handling for WindowsOliver Wolff2012-11-275-14/+29
| | | | | | | | | | | | | Filtering touch events depending on Qt::WA_AcceptTouchEvents is not trivial. I thought about doing so in QWidgetWindow::handleTouchEvent but the target widget (not window), which has to be checked, has to be obtained using the primary touch event's position etc. Thus that is not part of this commit and will be done in a followup. Change-Id: I876ee72acd7fdfbe46da61c6eb3c5891ea319cd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* adjust to modularization changes in ActiveQtJoerg Bornemann2012-11-273-27/+8
| | | | | | Task-number: QTBUG-27776 Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix possible assertion when using stringToCMap() for a multi engineKonstantin Ritt2012-11-271-4/+3
| | | | | | | | | | | If (*nglyphs < len), stringToCMap() sets *nglyphs to len and returns false immediately; the caller then must resize the buffer and re-try. However, QFontEngineMulti::stringToCMap() doesn't update the nglyphs value and thus the second call would fail, too. This is quite unexpected. Change-Id: Id2cce7b9faf7706c382fccf023e1b7affa9a10be Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* qdoc: Listing group members across modulesMartin Smith2012-11-2716-417/+395
| | | | | | | | | | | | | | This is a first attempt at fixing the problem, but it probably is not the entire solution. The problem requires adding attributes to the index files and then reusing them when the index files are read. The same problem will be affecting the module lists themselves, but that is not fixed in this update. Task-number: QTBUG-28036 Change-Id: I8593d5b9446e51a5204b6c71f8c4f2b63f445972 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Properly deprecated QGLFramebufferObject and QGLFramebufferObjectFormatSamuel Rødal2012-11-271-1/+5
| | | | | | Change-Id: I9affdcce0988e3538c8a7a696999a7cf8c3448aa Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove remaning TARGET.EPOCHEAPSIZE settings from examples.hjk2012-11-272-4/+0
| | | | | | | Not needed anymore. Change-Id: I28b6566e1498afb68295c16e8786fe8bc0256361 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Improve OpenGL docsJan Arve Saether2012-11-278-2/+15
| | | | | | | | | * Mark all Open GL classes with \inmodule QtOpenGL. Otherwise, they weren't listed in the list of classes. * Remove a reference to Motif Change-Id: I75680712b212cf46b869014d3678b56d022c6323 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed abbreviations in QWindow::framePos() and QWindow::setFramePos().Samuel Rødal2012-11-277-17/+18
| | | | | | | | | | | | As 672e7c875e8680818e23d0aef98129d95eb7e91c did changing pos() to position() and setPos() to setPosition(). Luckily there's not much code that uses these. Change-Id: I1e1982f00412a22bd376e667a5e8c30b6149f9b5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove dependency of fusion style on windowsTasuku Suzuki2012-11-272-21/+29
| | | | | | | | | Fusion does not depend on Windows qfeatures.h regenerated from qfeatures.txt (QT_NO_LIBRARY and QT_NO_STYLE_FUSION were missing) Change-Id: I5e650a826abb788c7ffb1f0f28d9bbb2d357b7a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix link to licensing pageLars Knoll2012-11-271-1/+1
| | | | | | Change-Id: I398a9e46fd9c4beacd9e8554dab544154e48b870 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Doc: write qttestlib.qch, not qttest.qchhjk2012-11-271-1/+1
| | | | | | | | | This is an enabler for https://codereview.qt-project.org/#change,40381 Change-Id: I2c2fdefab041dc9332816aefbe85ff66c275ca63 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Mac: Fix wheel event handling on 10.6Liang Qi2012-11-271-5/+5
| | | | | | | | | Change "else" case to support compiling on 10.7+ and deploying on 10.6 Task-number: QTBUG-28060 Change-Id: Iaaeaaefe98083863ed750c7cb320db02e16543af Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix overview documentation.Lars Knoll2012-11-261-2/+4
| | | | | Change-Id: I8a3427be51673d071bcf467ea7d6d12472b6f841 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Ensure subfocus is not reset to 0 when hiding a panel.Andreas Aardal Hanssen2012-11-263-60/+118
| | | | | | | | | | | | | | | | | | | When hiding any widget that is not a panel, it is correct to clear subfocus. In case clearFocus() has been called, the result is that focusItem() / focusWidget() points to 0, which is correct. Upon reactivation, nothing gains input focus. When changing focus, the following setSubFocus() call will ensure subfocus points to the new widget. When hiding a panel, however, it's essential that subfocus within that panel is not cleared, otherwise, when re-showing the panel, nothing will have focus, whereas the expected behavior is that focus is restored to the last item that had focus, i.e., the focusItem() a.k.a. subfocus widget. Task-number: QTBUG-22256 Change-Id: I84d849a505764e074e1369fef923cef1ad5c0b1e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* tr()-Fix: Do not add up translateable strings.Friedemann Kleint2012-11-261-2/+1
| | | | | | | | | Placeholders might go to a different position in translated strings. Change-Id: Id6a84ea931dc0487bd72eb8d01669369a3dce9c6 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Allow qmljsdebugger argument and value to be separated by a spaceAurélien Gâteau2012-11-261-0/+3
| | | | | | | | | | This change makes it possible to use the QML JS debugger with KDE applications. Change-Id: Id5838fa34dcb8b54127abc6da6fe7c2e9a5a1c2e Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QMacStyle: cleanup unused includesJ-P Nurmi2012-11-261-7/+0
| | | | | Change-Id: I8fbc33f86fac5abed4553d35fac2973f47a445e9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fixed crash in tst_qglthreads.Samuel Rødal2012-11-261-1/+1
| | | | | | | | | | | | QGLTextureCache has a read write locker to protect texture lookups. However, even calling QCache::object() might modify the cache, causing race conditions, since it modifies the priority order of the objects in the cache. Therefore, we need to protect it with a QWriteLocker instead of a QReadLocker. Task-number: QTBUG-22560 Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix example paths in example manifests that are used by Qt Creator.Eike Ziller2012-11-2611-0/+22
| | | | | | Task-number: QTBUG-27801 Change-Id: I345c009fc0e4e1c1eabb43ad142e3b474e7a6fee Reviewed-by: hjk <qthjk@ovi.com>
* tr()-Fix: Shorten QFtp error message.Friedemann Kleint2012-11-261-1/+1
| | | | | Change-Id: Id2a901c31eafb35bdbbc187f1e5edb74212c361a Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Mac: Reworking flat QGroupBox lookGabriel de Dietrich2012-11-261-15/+25
| | | | | | | | The line has been removed, giving a globally cleaner appearance. Also, the label font size has been increased to normal size. Change-Id: I3ef9d59ca54755c6fa158e943e4a6ce94eb05065 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove last usages of qSin and friends from QQuaternionSean Harmer2012-11-261-6/+6
| | | | | Change-Id: I93fe1d22313da4cfa671603ccdbe9ac8f02cd73b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Examples: inherit NorwegianWoodStyle from QProxyStyleJ-P Nurmi2012-11-263-18/+26
| | | | | | | | | | | | | | The QStyle specializations are being made internal. The recommended way to customize styles is now to use QProxyStyle (& QStyleFactory), or to implement a full custom style one can alternatively subclass QCommonStyle. The proxy style approach was chosen for this case, since the example assumes some drawing functionality provided by the windows style and it is not a "complete" custom style implementation but more like a customization anyway. Change-Id: Ib2477339cfef258cfc944a76a2eea728066e1f45 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* qmake: Change copyright information from Nokia to DigiaSergio Ahumada2012-11-264-5/+5
| | | | | | | Task-number: QTBUG-28156 Change-Id: If54615a465504b4124891fb393185eb324372874 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Moving code for PE_IndicatorArrow* from windows to common styleThomas Hartmann2012-11-262-74/+74
| | | | | | | | If QCommonStyle is taking the place of a common base style, it should support PE_IndicatorArrow*. Change-Id: Iec08a37bf3a501bcca61751b11e907999f538e34 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Widgets/Painting examples: inherit ArthurStyle from QCommonStyleJ-P Nurmi2012-11-262-12/+12
| | | | | | | | | The QStyle specializations are being made internal. The ArthurStyle does not seem to require anything from QWindowsStyle, but QCommonStyle as a base class gives just as nice looks. Change-Id: I5ad8dd881e03f166ae5d3aedccb2688952dc0a28 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Ensure QMAKE_PRL_LIBS is a unique list.Friedemann Kleint2012-11-261-1/+5
| | | | | | | | | Windows static builds currently fail due to overlong command link lines containing multiple occurrences of base libraries. Task-number: QTBUG-28131 Change-Id: Ibf7f551fc98c879111b32b27a16f4e96260743c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Only allow caching for HTTP GET and HEAD requests.Michael Brüning2012-11-262-2/+8
| | | | | | | | | | | | | | Added a method to QNetworkReplyHttpImplPrivate to check whether the HTTP operation used in the current request allows for caching. This should only be the case if the operation is GET or HEAD. The response to all other request are not really cacheable and should be disallowed from caching. Change-Id: I7c31bae42814d157a800d43565e5cb9adfb879f7 Task-number: QTBUG-28035 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Fix build error with QT_NO_FILESYSTEMITERATORTasuku Suzuki2012-11-264-4/+8
| | | | | Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: clean up unused CFG_IMTasuku Suzuki2012-11-261-2/+0
| | | | | | Change-Id: I91a09e29a3bf79610a34c30ffe9c145c7e76d1b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change contact-us from Nokia to DigiaSergio Ahumada2012-11-261-5/+5
| | | | | Change-Id: I0d94b66d802c3899009dde1e570f195aadd861dc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change license header from Nokia to DigiaSergio Ahumada2012-11-2616-16/+16
| | | | | Change-Id: I2be215284d7670f60f8b5838fce1e6832dde2270 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Move isBuiltinType() to namespace QtPrivate and export it.Friedemann Kleint2012-11-262-5/+9
| | | | | | | | | | | There is currently a symbol clash with a duplicated isBuiltinType() in ActiveQt's dumpcpp-tool, which breaks static building. Reuse the function. Task-number: QTBUG-28131 Change-Id: I4985e8405924754aa613311ca3f06d6ba29758b8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>