summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning about unused variable in qdocThiago Macieira2012-12-231-1/+1
| | | | | | | codeparser.cpp:245:18: error: unused variable ‘dn’ [-Werror=unused-variable] Change-Id: Id271b3829ba3278e80d4e79746db7aabfabd751a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QUrl::fromUserInput: fix for urls without a host.David Faure2012-12-231-2/+1
| | | | | | | | | | QUrl::fromUserInput("http://") was invalid, which doesn't make sense since QUrl("http://") is valid. Same for "smb:" which is actually even more a valid URL from a user's point of view. Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix warning about unused variable in QtPlatformSupportThiago Macieira2012-12-221-1/+1
| | | | | | | | | | | | | | | | | | GCC was complaining: qevdevtouch.cpp:475:13: error: 'maxId' may be used uninitialized in this function [-Werror=maybe-uninitialized] Which got me scratching my head: maxId was unconditionally initialised. How could GCC be complaining about it being uninitialised? Well, turns out that bestId could be uninitialised and the code does: if (bestId > maxId) maxId = bestId; Of course, if bestId was uninitialised, the warning should have been in the "if" line first. Change-Id: I5e174ab2957d76ad040c14fa6ef8535129b6dce3 Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-2112-49/+49
| | | | | Change-Id: Ie8f437b8dfe8a67c7b34321439dd988a02612437 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use the new QUrlPrivate::validateComponent validator in the main parserThiago Macieira2012-12-211-54/+11
| | | | | | | | The code was copied from the main parser there, so remove the duplication. Change-Id: I85748f6f76b3097ff22958d9de67cfa27061a72b Reviewed-by: David Faure (KDE) <faure@kde.org>
* Make sure that the strict parser is also operating on setXxxThiago Macieira2012-12-211-43/+136
| | | | | | | | | | | These cases weren't handled before. The validateComponent function is copied from QUrlPrivate::parse, with the added modification that it now needs to check the gen-delims for the userinfo. Change-Id: I055167b977199fa86b56a3a7259a7445585129c6 Reviewed-by: David Faure (KDE) <faure@kde.org>
* add and use qtHaveModule() functionOswald Buddenhagen2012-12-215-7/+7
| | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix some typosSergio Ahumada2012-12-217-8/+8
| | | | | Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* fix linker command lineOswald Buddenhagen2012-12-211-1/+1
| | | | | | | | gcc is apparently tolerant against this abuse. icc is not. Task-number: QTBUG-28775 Change-Id: I872d32177562f076ca8aecd263bc4bb3c7e8edc0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge "Merge 'release' into stable" into refs/staging/stableOswald Buddenhagen2012-12-212-0/+46
|\
| * Merge 'release' into stableOswald Buddenhagen2012-12-192-0/+46
| |\ | | | | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| | * Fix font sizes when X11 has a forced dpi settingv5.0.0Lars Knoll2012-12-182-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, the X resource system can override the physical DPI of the screen for resolving font sizes etc. Correctly load the setting and adjust the logicalDpi() accordingly. Change-Id: Id60d03d1d214fb99e9de17a65976abd170bb7cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Fix direct compilation of qtypeinfo.h and othersThiago Macieira2012-12-183-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from commit 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Initalize the printinfo on Mac if it requests and it needs initalizingAndy Shaw2012-12-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the print panel was closed then it would clean up the printinfo and if it was requested for the same QPrinter then it would not be recreated in time. Therefore we check if it is initalized and if not we re-initalize it. Task-number: QTBUG-28657 Change-Id: I7dc9011b80e03cfa3eae8fee2fcf6cc8021a8566 Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from commit dde9569d389b4382e8869ac48f942adb3c51ade7) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Correcting qhp link to Qt SQL's C++ Classes.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I0faae04ab125236554cb39659169780e2ab64629 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 7d685afe5d9f2055dc24d5a978355893c8183758) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Correcting qhp link to Qt GUI C++ API.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I224d55adc1be77138237da4efcac01641964c06b Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 771e29178d792274bd122e68c71a97eced2aafe4) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Moved content from qtdocVenugopal Shivashankar2012-12-184-2/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 69e602941112da325b1154e0dc52714bc27a2cc8) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Fix styleName support in QPA font databaseJiang Jiang2012-12-149-41/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Font styleName support was disconnected since Qt switched to QPA fontdatabase. Now add the code from Qt 4.8 back to enable this in QPA. Change-Id: Iab2cbfd5468f87542183348c2123ca4b2c270692 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit fa7661d8b25fa338649a301010e1b5a2b63da731)
| | * Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ie81507ed011fc096e0f5edad146e97c392e86494 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit 3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa)
| | * Fix QGtkPainter::reset() to reset the clip rectJ-P Nurmi2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to preparation for GTK3 support, QGtkStyle::drawXxx() no longer creates a local instance of QGtkPainter upon every call, but QGtkStylePrivate::gtkPainter() will (in the future) dynamically choose between QGtk[2|3]Painter. The same painter instance is now re-used between the calls, but wasn't properly reseted between. Task-number: QTBUG-28557 Change-Id: I29be318dbb54d97ed23dfb88d406a3a833db4369 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from commit 0b0b74a563d1513e7857000526d5c0fa462ff6af) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Fix typo in docs.Richard Moore2012-12-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I37ccb10d40d2a848b7c251286d29aeb85411e912 Reviewed-by: hjk <qthjk@ovi.com>
* | | Mac: fix transient QScrollBar flashingJ-P Nurmi2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28669 Change-Id: I9825584f15c34709f7897533220911b6bf3ea21d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | QAbstractProxyModel: Document setSourceModel a bit moreDavid Faure2012-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | Especially so that subclasses remember to emit reset. Change-Id: Iadcae3fc5fe72584465d4134f385ed0a1d77bfcd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Doc: Removed the \relates instancesVenugopal Shivashankar2012-12-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc supports \relates in the context of a function that relates to an existing class or a namespace, but not in the context of a class. We can use \sa to list the related classes or namespaces for a class instead. This change ensures that QDoc generates documentation for QMessageLogger and QMessageLogContext classes. Task-number: QTBUG-28468 Change-Id: I2242ab730fe5e3acf54b6fa65774e751d2daa7a4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Style animations: fix QCommonStylePrivate::stopAnimation()J-P Nurmi2012-12-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly delete animations, and remove the check for stopped state as that is already done by QAbstractAnimation::stop() and we want to delete the animation regardless of the current state. Task-number: QTBUG-28506 Change-Id: I3e34316e5077a8627ff5e6d3babd1873bbbaa774 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Fix linking ANGLE on MinGW-w64 64-bitJonathan Liu2012-12-207-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MinGW-w64 32-bit .def files shouldn't be used with MinGW-w64 64-bit. Rename .def files from <library>_mingw.def to <library>_mingw32.def and only use them if QT_ARCH is i386. Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Patrick von Reth <vonreth@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Generalize the check for gui in static plugin import generationMiikka Heikkinen2012-12-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the check for gui by checking for needs_qpa_plugin CONFIG value instead, which gui adds to MODULE_CONFIG. Task-number: QTBUG-28215 Change-Id: I5834a3f81e5c3868ee1a3fa405ebc6410db1f900 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Enable module build with QT_NO_ACCESSIBILITYTasuku Suzuki2012-12-2015-10/+58
| | | | | | | | | | | | | | | | | | Change-Id: I330c3ddd70232d94eae5543cb0282b962e67eae5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Use PG_VERSION if PG_MAJORVERSION is not definedAndy Shaw2012-12-201-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When only PG_VERSION was available for getting the client driver version for PostgreSQL it meant that it would not detect the client version and subsequently would not set the connection up correctly as a result. This fixes the blob test already in tst_qsqlquery. Change-Id: Ie2176a43b6be9c0e835498fca5aea129f0cc8fc6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | Fix the computation of the location of mkspecs.Stephen Kelly2012-12-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The location of the mkspecs directory comes from the archdatadir, which distros will all set. Change-Id: I20dbdce76db13dbd37eec065009e215f98985907 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Prevent a crash if the pixmap passed in is nullAndy Shaw2012-12-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If the pixmap passed in is null then we should not try to create a NSImage for it, so we just return 0 instead. Change-Id: Idae7ba304c97878e0aa8ae1eead5f4bb644a73de Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | DBUS: Fix linker errors on Windows.Friedemann Kleint2012-12-202-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDBusMarshaller symbols were duplicated. Initial-patch-by: vonreth@kde.org Change-Id: Ic66681696aaf2a440119c06fce8d1dbd99c8396a Reviewed-by: Patrick von Reth <vonreth@kde.org> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Review of documentation.Michele Caini2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Terms fixing. Changes apply to Qt5 as well as Qt4. Change-Id: Ibb31ab0d68c62f3feb63722dd967932c2543fa37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Update connman bearer plugin for changed connman API.Lorn Potter2012-12-202-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | This should also remain working for previous connman Change-Id: I5f0a1947f11948b202391ba0c256067faa01ce6d Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Make qtestaccessible.h compile on its own.Thiago Macieira2012-12-191-0/+2
| | | | | | | | | | | | | | | | | | | | | It needs the QTest namespace and QTest::qWait to be declared. Change-Id: I1c72a13231603a61221cf1b7ad9234aa4cba6d60 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Similarly to the 797f3c0a01e9, fix qbasicatomic.h inclusionThiago Macieira2012-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | qatomic.h includes qbasicatomic.h, so break the cyclic inclusion problem. Change-Id: If72bacbcfa36993336786f31e8980fbd43df8bdc Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | Mac: Ignore ScrollBarAlwaysOn policy for transient scrollbarsGabriel de Dietrich2012-12-192-12/+17
| | | | | | | | | | | | | | | Change-Id: I8a542263df64a21cad6b8cddc5ab1d8a93e153d5 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Mac: New rendering for disclose triangle, get proper color when selectedGabriel de Dietrich2012-12-192-16/+27
| | | | | | | | | | | | | | | Change-Id: I2be0a28df3f5dd2fdfae13be6ec98763a04187c1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2012-12-191-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com>
* | QDoc: Fix warning - unused variableFrederik Gladhorn2012-12-191-1/+1
| | | | | | | | | | Change-Id: Id4068e1a1fcfad8fb3cc9174f995cb2b73b6e194 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fix linking ANGLE on MinGW-w64 32-bitJonathan Liu2012-12-197-2/+449
| | | | | | | | | | | | | | | | | | MinGW-w64 32-bit requires the functions exported in the .def file to be decorated. Change-Id: I174a92829706a9fb6b0007b2c057300bd69e6d9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Change ftp.qt.nokia.com -> ftp.qt-project.orgSergio Ahumada2012-12-183-4/+4
| | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I0060144f0336791933205355b125251ccba73b3e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Qt Gui Examples: Fixed QDoc filesChristiaan Janssen2012-12-181-2/+3
| | | | | | | | | | Change-Id: I160d8d186a1078f20f2b779bfbdae90459c27641 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Accessibility indexes are no longer 1-based.Frederik Gladhorn2012-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | The updates for focus/selection in QTreeView were still adding +1 as it was required in Qt 4. Task-number: QTBUG-28174 Change-Id: Ib9fea7e20d431a0ef0db18494e7bdda06a0646b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | ANGLE: Fix typedefs for Win64Jonathan Liu2012-12-182-0/+45
| | | | | | | | | | | | | | | | | | The long int type is incorrect for Windows 64-bit as LLP64 is used there. Change-Id: If4ccf49d6bb0cd7ba4ff2997cebfdbe5e7e9711c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Accessibility Linux: Prevent access to invalid interfacesFrederik Gladhorn2012-12-181-5/+20
| | | | | | | | | | | | | | | | | | | | | | Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Do not build dlldata.c in static buildsMiikka Heikkinen2012-12-181-2/+6
| | | | | | | | | | | | | | | | | | | | Symbols in dlldata.c conflict with symbols defined in ActiveQt when linking Windows platform plugin statically into same binary. Fixed by not building dlldata.c when building static library. Task-number: QTBUG-28645 Change-Id: Ibc5928124ad6e1fde2a1fa761ada4f345eb65a20 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Fix direct compilation of qtypeinfo.h and othersThiago Macieira2012-12-183-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Blackberry: Reset virtual keyboard when shown.Sergio Martins2012-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyboard mode is shared between applications. You can reproduce this bug by clicking on a spin box, it will open a number only keyboard, then close the application and run an application that shows a text edit: a number only keyboard will appear. PPS keyboard already does this. Change-Id: Ia22e96ce13ad0cec1fd3b43fcdf4d03abfc25134 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Initalize the printinfo on Mac if it requests and it needs initalizingAndy Shaw2012-12-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | When the print panel was closed then it would clean up the printinfo and if it was requested for the same QPrinter then it would not be recreated in time. Therefore we check if it is initalized and if not we re-initalize it. Task-number: QTBUG-28657 Change-Id: I7dc9011b80e03cfa3eae8fee2fcf6cc8021a8566 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 04:31:31 +0000