summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement the move constructor for containers.Olivier Goffart2012-05-118-2/+28
| | | | | | | | | | | | | | | This changes all the containers that uses QtPrivate::RefCount (QMap already had one), and QVariant In Qt 4.8, it was pointless to have the move constructor because we did not have quick way to re-initialize a null container. (shared_null still needed to be refcounted) But now that we have RefCount, and that the shared_null do not have reference count, we can implement a fast move constructor that do not generate code to increment the reference count. Change-Id: I2bc3c6ae96983f08aa7b1c7cb98d44a89255160b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make sure animation drivers knows about the temporal offset after a pauseGunnar Sletta2012-05-113-1/+33
| | | | | | Change-Id: I932e469389241f6a12816b52180936f061cd78f8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com> Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
* Change to/fromAscii to to/fromUtf8 in the QString conversionsThiago Macieira2012-05-114-64/+64
| | | | | | | | | | | This commit matches the previous documentation commit that says that the conversions are applied using to/fromUtf8. Change-Id: I304e4d866ddedac5094fef8500cbeba299a02cb5 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix QString::isRightToLeft() for SMP code pointsKonstantin Ritt2012-05-112-1/+44
| | | | | | Change-Id: Ib8afc932d9566df1a8922da9a75b9f9cbbdd321d Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make the qt5_use_modules public API.Stephen Kelly2012-05-103-39/+40
| | | | | | | | | | | | | | This cmake function handles all of the necessary logic for using the include directories of Qt modules, linking to Qt modules, adding the required definitions, and most importantly, adding the position independent flags required on UNIX systems to use Qt by default. The function relies on functionality available in CMake 2.8.8, so it is only available if that version of CMake or greater is used. Change-Id: Ibe698e06819129479348c240844264c41553b5fb Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Keep object name of QWidgetWindow in sync with the widget.Friedemann Kleint2012-05-103-10/+14
| | | | | | | | Use new objectNameChanged() signal. Change-Id: I247566bd51d23ec65ff74ba9ac7be0d18e8ff160 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile.Morten Johan Sorvig2012-05-101-0/+1
| | | | | | | | gtkstyle depends on x11. Change-Id: Ia056b5e63c1f1eedfa107f7622226e6a59dae894 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix deprecation warnings in QtGui, QtPlatformSupport.Friedemann Kleint2012-05-102-9/+7
| | | | | Change-Id: I355a059c5311928301907d5d1e3ecce00a94341d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix for windows platform plugin to work with WINCE.Bjoern Breitmeyer2012-05-1024-110/+802
| | | | | | | | | | | Made opengl optional. Made Clipboard and Accessability optional. Moved internal mime data into its on source file, was implemented in the clipboard source which is just strange. Change-Id: I6ddf0c656533bd45e22e24492fc2254d15b7822f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add underscore to internal implementation detail variables.Stephen Kelly2012-05-101-11/+11
| | | | | | Change-Id: I4c70ed2808396931fff986fbfad5940dd39e74f6 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the VERSION_STRING in CMake config files.Stephen Kelly2012-05-101-0/+1
| | | | | | Change-Id: I9f0e9316241b4cb615350876b11ee263f7efd3bf Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove the HAVE_DECLARATIVE define.Stephen Kelly2012-05-102-7/+0
| | | | | | | It is unconditionally defined. Change-Id: I8961805eab984dd7331b7ce3dc228a031193892b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix warnings in evdevkeyboard-plugin.Friedemann Kleint2012-05-103-8/+9
| | | | | | | | - Fix warning about set-but-unused variable in case QT_NO_LIBUDEV. - Compile with QT_NO_CAST_FROM_ASCII, string usages. Change-Id: Ie98f1b4283919be878f8bbfc6e7378ad655152f8 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Change Wince functions definitionAndreas Holzammer2012-05-101-30/+84
| | | | | | | | | | | | | Use inline functions, instead of defines for global functions. As the defines will break member functions that have the same name. As inline functions are only available for C++, just define them for C++. This will only effect 3rd party dependencies, but they don't need them anyhow. Change-Id: I929562401e03f08b068edba107a3f67a585952a2 Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Correctly parse json documents with a leading BOMLars Knoll2012-05-104-2/+34
| | | | | | | | A leading byte order mark is valid in utf-8 and we should parse documents starting with those correctly. Change-Id: Id85398ff6e05b93ceefbaf4a6de5571d5e61ca13 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* QDoc: Generate images inline for \inlineimageCasper van Donderen2012-05-101-5/+3
| | | | | Change-Id: I1ee001870ac1289a8b0340707f62c7cc3fb84492 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* qdoc: Removed some obsolete ifdefsMartin Smith2012-05-105-20/+4
| | | | | | | Also removed a few useless comments. Change-Id: I62a52bb826c1299ea9da3f0f3c23f267703c6509 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix warnings about unused variable d.Friedemann Kleint2012-05-101-1/+0
| | | | | Change-Id: I8fc204928699c5a5821f9381e08b52fa2bc74fbf Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Compile with -qtnamespace on WindowsBradley T. Hughes2012-05-101-11/+11
| | | | | | | | qatomic_msvc.h declares some Windows intrinsic functions which should not be in the Qt namespace. Change-Id: I1b2f91798159c08cf167ee3d1ed2818c12c9b833 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* XShaping drag and drop fixesAlbert Astals Cid2012-05-102-9/+13
| | | | | | | | No shaping rectangles means no interaction with the window The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point Change-Id: Ic9004a8ec0f447cddcd1b4324d9fd60a94787cb9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* qdoc: Fixed a qdoc error problemMartin Smith2012-05-103-63/+61
| | | | | | | | | | When a page exists in more than one file, qdoc was reporting this sometimes without reference to the locations of the files. This has now been fixed. Change-Id: I0697acc170b94a74b15fb384556dd76f764f7792 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Avoid trying to load libthai again and again if it's not presentSimon Hausmann2012-05-101-1/+3
| | | | | Change-Id: I3bcbde7bbb307fb27c36709c33c8ff5cd09ab7f8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* move the default text breaking algorithm impl from HarfBuzz to QtKonstantin Ritt2012-05-1017-744/+587
| | | | | | | | | | | there are several reasons to do this: * text breaking is not a shaper's job; * since the text breaking rules are bound to a specific Unicode version, updating Qt's internal unicode data would require updating the data in HB as well; * makes porting to HurfBuzz-NG some easier Change-Id: I0bbf8e8a343bc074696f4ddf2ae4e7fa32a61629 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* add some useful methods to QUnicodeTables::Konstantin Ritt2012-05-106-46/+88
| | | | | | | in order to reduce code duplication and prepare the ground for upcoming changes Change-Id: I980244149f65384c9484bbec4682de8b7b848b08 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge "Merge branch 'docs-refactoring' into master" into refs/staging/masterMarius Storm-Olsen2012-05-101114-1418/+10274
|\
| * Merge branch 'docs-refactoring' into masterMarius Storm-Olsen2012-05-101114-1418/+10274
| |\ | | | | | | | | | Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
| | * Don't add C-style copyright headers to qmake project filesMarius Storm-Olsen2012-05-106-240/+0
| | | | | | | | | | | | | | | | | | | | | | | | Leads to parse errors, and we don't really put copyrights into these files anyways. Change-Id: I4b423b3f4f5c4f1f5051d8e3613133c4f1df342a Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Doc: Move some remaining files over for modularization.Casper van Donderen2012-05-09141-248/+5576
| | | | | | | | | | | | | | | | | | | | | | | | | | | The files in this change were still in qtbase/doc/src or required for it. qtbase/doc/src should now only contain example documentation and images for the example documentation. Change-Id: Ia7ca8e7fd2b316e77c706a08df71303bc8294213 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Add "make docs" targets for libraries.Casper van Donderen2012-05-097-0/+21
| | | | | | | | | | | | | | | Change-Id: I249c238f4986f443f84aaa6a3ac4ce102abff4db Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtTest documentation.Casper van Donderen2012-05-0914-33/+1327
| | | | | | | | | | | | | | | | | | | | | This change moves the snippets to the modularized directories. Change-Id: I917dd1dae5ee5d4b6bd5a0390783a8b9a99edc06 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtPrintSupport documentation.Casper van Donderen2012-05-0914-7/+185
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: Ib8f8556bcef13593ee40ac1122d765ed307ecb93 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtOpenGL documentation.Casper van Donderen2012-05-0912-15/+263
| | | | | | | | | | | | | | | | | | | | | This change moves the snippets to the modularized directories. Change-Id: Ifcf22fa3f234681f851d1e7eed5fe44e2e223ffd Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtWidgets documentation.Casper van Donderen2012-05-09604-714/+1281
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: Idec1afb9db7ea6add1ca4cf25ec4019d8bce0c4d Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtGui documentation.Casper van Donderen2012-05-09221-157/+249
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: I5f86f598fbe7c47d632c613b85d94ced89ba2c29 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtDBus documentation and add missing file to QtNetwork.Casper van Donderen2012-05-0931-53/+1294
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: Idacff866735d00b048d65318bc4c3ee1dfa16310 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtConcurrent documentation.Casper van Donderen2012-05-0915-46/+138
| | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: If52f69c0f8bb4d2df4ee46f5524a82047ec214de Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Fix typo in QtNetwork qdocconf.Casper van Donderen2012-05-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I759e8a77b0471d380ffd9f893ae5bb5ed0c5c992 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtNetwork documentation.Casper van Donderen2012-05-0941-52/+52
| | | | | | | | | | | | | | | | | | | | | This change moves the snippets and imagesto the modularized directories. Change-Id: If14912692a7f72d7de345eaf88d9ec9752310fca Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Properly implement a 'make docs' target for subdirs and apps/libsMarius Storm-Olsen2012-05-0913-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call qdoc for projects which sets the QMAKE_DOCS variable to point to a qdocconf file. Exclude examples/ and tests/ from the qdoc run, by adding no_docs_target to CONFIG for those projects. Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | gettingStarted, part 3-5: sanitize parameter names and compile fixhjk2012-05-106-6/+9
| | | | | | | | | | | | | | | Change-Id: I12795439de71a41728f98b3d3438324664b27a0f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | qpa: Remove QPlatformDialogHelper::deleteNativeDialog()Bradley T. Hughes2012-05-1012-51/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function isn't really needed. The QDialogPrivate destructor deletes the platform helper, so the QDialog destructor does not need to do it. Subclasses of QPlatformDialogHelper are now responsible for deleting any native resources they create. The one place in QFileDialog that needs to recreate the native dialog can simply recreate the helper. QDialogPrivate::deleteNativeDialog() now becomes QDialogPrivate::deletePlatformHelper(), which resets all state to allow the platform helper to be recreated. Change-Id: I58adfe8801e02e63b3cb4a9a3a0b8cb5b3c7b161 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | qpa: Clean up QPlatformDialogHelper APIBradley T. Hughes2012-05-1013-104/+104
|/ / | | | | | | | | | | | | | | | | | | Remove the _sys suffix from all members of QPlatformDialogHelper and its subclasses. The QPlatform* class prefix already implies that these methods are system specific, we don't need the method suffix as well. Change-Id: I5ad1f928fab3a989992951acc244915e7fa48d32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Fix a crash when parsing a URL with username and port, but no passwordThiago Macieira2012-05-102-1/+11
| | | | | | | | | | | | | | | | | | | | This was crashing because the ':' was found past the end of the username, causing the recoder to run from position 22 to 11, via the long way around the memory. Change-Id: Ic1ae596f34f7db857fb4210294974fb5a6adf691 Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Fix test case dependency in tst_exceptionsafety.Jędrzej Nowacki2012-05-101-17/+77
| | | | | | | | | | Change-Id: Icb3887e8bca55a7e76b264b0a5ce8aa2dd118275 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Don't ignore default font's font capitalization in QTextDocumentEskil Abrahamsen Blomfeldt2012-05-101-4/+6
| | | | | | | | | | | | | | | | | | The consequence of this was e.g. that it would be impossible to set the capitalization of TextEdit elements (or Text elements with RichText format) in QML. Change-Id: Ie219fac7e4305efc59a4ac9da5b06c25ff3ac9ac Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | Fix a QSslSocket test expectation on ubuntu 11.10Shane Kearns2012-05-101-4/+8
| | | | | | | | | | | | | | | | | | | | Because SSL2 is disabled in ubuntu's openssl binaries, the SSL connection is expected to succeed rather than fail when the server side is using SSL3/TLS1.0. Used the OPENSSL_NO_SSL2 macro to decide this. Change-Id: I2c35aa5aa0c9432ae78000c81f70086bdc31843d Reviewed-by: Richard J. Moore <rich@kde.org>
* | Remove QAbstractDeclarativeData::objectNameChanged.Michael Brasser2012-05-102-4/+0
| | | | | | | | | | | | | | | | | | | | There is now an actual NOTIFY signal for this property, and the callback is no longer necessary. Change-Id: I664714e22e607c747f144250cfb78de8c1d28686 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | qdoc: Fixed three qdoc error problemsMartin Smith2012-05-094-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. For QML properties documented in a .qml file, qdoc no longer prints the error message that it can't detect whether the property is read-only. 2. For QML properties documented in .cpp files, qdoc now includes the file path and line number, when it prints the error that it can't detect whether the property is read-only. 3. qdoc also includes the completely qualified property name in the error messages described in 2. Change-Id: If88381783fd0f29271f579ae170a0a6f4b1a7344 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | QDoc: Remove generateQmlDesc and use generateApiDesc instead.Casper van Donderen2012-05-092-22/+6
| | | | | | | | | | | | | | | | | | generateQmlDesc was basically a copy of generateApiDesc. Just using generateApiDesc also fixes a bug with the generation of a <shortDesc> inside an <apiDesc> Change-Id: I129a24ab0244283cc394c2afacc0f8227e4e5a88 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* | Remove garbage.Stephen Kelly2012-05-091-1/+1
| | | | | | | | | | Change-Id: I0801932ee9ce7002fdf897354f9e6e6d3999c8c2 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>