summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* BlackBerry mkspecs: optimize linker flagsPeter Hartmann2012-11-262-0/+4
| | | | | | | | | | | | | | * relro makes some sections read-only before giving control to the program; * now resolves all symbols when the program is started and allows for the GOT being marked read-only to prevent it from being overwritten. These settings have been used internally for device builds already. Change-Id: I9f62fffe618c75748e2357d1686289c23c5dbee5 Reviewed-by: Greg Bentz <gbentz@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.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>
* Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$examplehjk2012-11-26301-586/+586
| | | | | | | | This makes the structure of the examples after an 'make install' similar to the one in a 'developer build'. Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454 Reviewed-by: Martin Smith <martin.smith@digia.com>
* qmake: Test recursive function callsKonstantin Ritt2012-11-261-0/+14
| | | | | Change-Id: If7d659728d30b2e5c52082ab999bc00de3733972 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* tst_QSharedPointer: update application typesJ-P Nurmi2012-11-262-13/+11
| | | | | | | | | QCoreApplication::Type enum was removed in 553e21. This change updates the (un)tested application types to match the application types available in Qt 5. Change-Id: I8631987a9ff31dc81baa013619cfc18616b851d1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* tst_QGridLayout: use QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-261-9/+8
| | | | | | | QWindowsStyle is soon to become an internal class. Change-Id: If163aae6910c0b082a9bcca1ebbab66660cc005f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* tst_QFormLayout: use QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-261-6/+5
| | | | | | | QWindowsStyle is soon to become an internal class. Change-Id: Ie28d4ea074938b17827aa803a2298f881946f7e5 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* tst_QBoxLayout: use QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-261-3/+3
| | | | | | | QWindowsStyle is soon to become an internal class. Change-Id: I287c771a841ba96e445f0a0df96ea035be25ac74 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* tst_QMenuBar: use QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-261-3/+6
| | | | | | | QWindowsStyle is soon to become an internal class. Change-Id: I422e7d67fadbb169d19285aab0a8ba0f3d668697 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* tst_QComboBox: use QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-261-4/+4
| | | | | | | QWindowsStyle is soon to become an internal class. Change-Id: Ic76ecc20ff600a7d401b44c8dc4d93198c06becc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix keyboard grab in QWidgetWindow.Friedemann Kleint2012-11-262-0/+24
| | | | | | | 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-252-2/+3
| | | | | | | | | | | 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>
* Update XKB data generator to use correct QLocale namesKonstantin Ritt2012-11-251-9/+9
| | | | | Change-Id: I55fd5f029d77950a9074d9c86a65499b48806ebe Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* LocaleSelector: Replace hard-coded impl with an algorithmic oneKonstantin Ritt2012-11-251-253/+23
| | | | | | | | The old implementation is just not acceptable! The new one is able to distinguigh locales by script. Change-Id: Ic772f6da8744825080f739e64af00267e5f82434 Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* QLocale: Fix matchingLocales() behavior if script or country is not Any*Konstantin Ritt2012-11-252-13/+48
| | | | | | | | | | | 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>
* QtBase: example code styleDavid Schulz2012-11-2532-93/+83
| | | | | Change-Id: I0685f7e2c7c698a4bf288b8b1ae909167932a3fb Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/richtext code styleDavid Schulz2012-11-2415-87/+90
| | | | | Change-Id: Ie0c27464e0fdb8f26caf0d8f27043da4ec45f41f Reviewed-by: hjk <qthjk@ovi.com>
* Fix QVariant streaming in Qt3 compatibility mode.Jędrzej Nowacki2012-11-242-3/+43
| | | | | | Task-number: QTBUG-27700 Change-Id: I0408293e43c3330dbc4746198a19709e795f552a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* tst_QDateTimeEdit: remove redundant includeJ-P Nurmi2012-11-241-1/+0
| | | | | | Change-Id: I3aeb90723b41b35e221b86b1767ed1ac45a9fe0c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* tst_QToolButton: remove redundant includeJ-P Nurmi2012-11-241-1/+0
| | | | | Change-Id: Ie55a530a89b85a4f3369ee3205221fb01fa1773e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* [SIC] QLocale: Update some language names with their modern valuesKonstantin Ritt2012-11-247-285/+298
| | | | | | | | 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-232-19/+24
| | | | | | Change-Id: Icda43d71d600d77fe1ed4fcde1ef4478ef29c1d5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Cleanup tst_QApplicationJ-P Nurmi2012-11-231-46/+46
| | | | | | | | | | | Remove redundant includes, remove references to deprecated QApplication::GuiServer (passing that has no effect anymore), and use QStyleFactory instead of referencing QWindowStyle directly (about to become an internal class). Change-Id: I08f94993a55ce6039c7694d8f7019cbd53594edc Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove QApplication::type() and make QCoreApplication::Type internalJ-P Nurmi2012-11-237-70/+22
| | | | | | | | | | | | 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>
* Make skipping of test consistent.Frederik Gladhorn2012-11-232-31/+1
| | | | | | | | | | | On Mac every function was skipped individually, on the other platforms it was marked as insignificant. See also QTBUG-22560 and QTBUG-22361 Change-Id: Ie9b9c617006d5a8c19d042b8be89e449c5ac70bc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 01:28:10 +0000