summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in SSL error message.Friedemann Kleint2012-11-271-2/+2
| | | | | Change-Id: If72d80979e1d2ea909227785cd691be39d75c8ab Reviewed-by: Shane Kearns <shane.kearns@accenture.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>
* 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>
* 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>
* 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-274-6/+7
| | | | | | | | | | | | 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>
* 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-262-14/+27
| | | | | | | | | | | | | | | | | | | 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>
* 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>
* 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>
* 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>
* Allow qdocconf to specify where the examples are located in install.Eike Ziller2012-11-263-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | We have qdoc configurations for the different qtbase libraries and modules now, which specify e.g. "../../../examples/opengl" for the exampledirs. That means that qdoc finds examples like "2dpainting/2dpainting.pro" which is then installed into "[QT_INSTALL_EXAMPLES]/opengl/2dpainting/2dpainting.pro". (At the moment even into "[QT_INSTALL_EXAMPLES]/qtbase/opengl/...", which will be changed to match the structure in source.) In order for Qt Creator to find the examples, qdoc must write the path behind [QT_INSTALL_EXAMPLES] into the example manifest file. This patch introduces "examplesinstallpath" that allows qdoc configs to specify the missing part, e.g. the opengl qdocconf can add examplesinstallpath = opengl to tell qdoc that the examples will be installed into "[QT_INSTALL_EXAMPLES]/opengl/" Task-number: QTBUG-27801 Change-Id: Idf518e16d3ca0f9522b084e92f34725b93e9d11f Reviewed-by: Martin Smith <martin.smith@digia.com>
* Cleanup QCoreApplication::Type letfover docsJ-P Nurmi2012-11-261-8/+0
| | | | | | | | The enum was removed in 553e21. Change-Id: I29bf049010b0424af3ca00095d8a36d53a7538e4 Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* docs: mark QMacStyle internalJ-P Nurmi2012-11-261-0/+1
| | | | | | | | QMacStyle was made internal in 27aa41, but was accidentally left public in the docs. Change-Id: Id7841718af3a21bbbda3102858d1a11bccb8179b Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Delete codecs pageLars Knoll2012-11-261-11/+0
| | | | | | | | Unused and empty. QTextCodec and the Unicode overview contains all relevant information. Change-Id: I779ba4dea69a88802e34541e4ba44215b5d69c2a Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix keyboard grab in QWidgetWindow.Friedemann Kleint2012-11-261-0/+2
| | | | | | | Task-number: QTBUG-28070 Change-Id: I6f55a2dd906ee896071137a5d47fb97c9a571b5f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* fix wrong comment about #ifdef's endPeter Kümmel2012-11-261-1/+1
| | | | | | Change-Id: I8a627c01ced1163e3ea72e9e2b1b55da04ca91b2 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Enable module build with QT_NO_CODECSTasuku Suzuki2012-11-261-0/+2
| | | | | | Change-Id: I27239384a7676a81495a9d3f7484975d2f277e8c Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change QTextLayout::textOption() to return a const reference insteadAndy Shaw2012-11-262-2/+2
| | | | | | | | | | | By changing textOption() to return a const reference we will get a performance increase when accessing this function internally. Task-number: QTBUG-28193 Change-Id: I65b594d844ebaee6d72f4a95d11bd2c5e801fab4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* moc: Fix assertion in QVector::first()Konstantin Ritt2012-11-251-6/+10
| | | | | | | introduced in aea68c93ae437a761584719f0f1ca93eaf6f7484 Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix color issue with sliders on Fusion styleJens Bache-Wiig2012-11-251-1/+1
| | | | | | | | We should not directly use the palette as it looks weird on mac. Change-Id: I2062bd43a8b28875330d9f8cc0eaa4069f3a43f6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Removed annotated list in Qt Core's group pages.Jerome Pasion2012-11-259-13/+3
| | | | | | | | | The annotatedlist commands are not needed as QDoc automatically generates the group members. Change-Id: I462bb65bd5f29c1761799d3d60acab0bd4886075 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* QHeaderView: - avoid cursor move on setDefaultSectionSizeThorbjørn Lund Martsum2012-11-251-0/+2
| | | | | | | | | | | If we are reacting on the sectionResized signal and we call setDefaultSectionSize we should ensure that we are not moving the mouse-cursor. This is an improvement of f8f6acb05ce9aa5fccc329bf5587adf14ed9a710 Change-Id: I1adee7821bc8fcc9633f692bfd515f2c458b12c8 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Improved tri-state checkbox in Fusion styleJens Bache-Wiig2012-11-251-10/+15
| | | | | | | | | | | This changes the tristate checkbox to look more distinct from the disabled checkbox. Task-number: QTBUG-27661 Change-Id: If0921c91d27b62552cbcf86563eed1b75e800478 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QLocale: Fix matchingLocales() behavior if script or country is not Any*Konstantin Ritt2012-11-251-13/+18
| | | | | | | | | | | Since the documentation doesn't mention the search should be done by language only, consider the current behavior incorrect. As of now, it is possible to get a list of locales by Country or Script as well. Also fix countriesForLanguage() to be in-sync with matchingLocales(). Change-Id: I6a09ca459120143565fa6099d2b823df1fed7c25 Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Fix QVariant streaming in Qt3 compatibility mode.Jędrzej Nowacki2012-11-241-3/+3
| | | | | | Task-number: QTBUG-27700 Change-Id: I0408293e43c3330dbc4746198a19709e795f552a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* [SIC] QLocale: Update some language names with their modern valuesKonstantin Ritt2012-11-244-277/+281
| | | | | | | | Some of them were incorrectly spelled (for a while) Change-Id: I871968e3bbdd2172f4c4dfb6e74729c05e7e8e01 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QLocale: Fix toCurrencyString() didn't respect group separator optionKonstantin Ritt2012-11-231-4/+3
| | | | | | Change-Id: Icda43d71d600d77fe1ed4fcde1ef4478ef29c1d5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Remove QApplication::type() and make QCoreApplication::Type internalJ-P Nurmi2012-11-236-70/+17
| | | | | | | | | | | | These Qt3 legacy application types do not match the application types available in Qt5. Thus, the decision was to kill the confusing and mostly useless type enum. Use for example qobject_cast instead to find out the application type. Task-number: QTBUG-28093 Change-Id: Ia8cf7c3ea98a3cea27f74760d62e519ea10bce9f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Draw disabled QMenu items in inactive state in vista style.Friedemann Kleint2012-11-231-1/+1
| | | | | | | Task-number: QTBUG-27992 Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Updated aboutQt dialog textLars Knoll2012-11-231-8/+10
| | | | | | | | | | | Updated supported platforms to match reality better, mention qt-project.org and other copyright holders. Task-number: QTBUG-25205 Change-Id: I4856d515500945ace55f7fd445b5b138aa00df83 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove Plastique and Cleanlooks from the widget galleryJan Arve Saether2012-11-233-292/+5
| | | | | | | | | | | | | | | | This commit does not remove the actual images, since they are referenced from many other places. Plastique style seems to have been used often as a style for showing a screenshot of a widget (probably because it has been available on all platforms). When fusion style gets its gallery with images, the references to the plastique images should probably be replaced with references to fusion images. Change-Id: I288c06df2c5e1f3a212b873ec0f087e119b895b0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Be consistent, and put all widget classes in the same page.Jan Arve Saether2012-11-237-149/+62
| | | | | Change-Id: I152a39e798a152b5362db7fdc63ccd6b887ee13b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>