summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | OSX: FileDialogHelper uses options to remember the selected filterShawn Rutledge2014-02-031-2/+4
| | | | | | | | | | | | Task-number: QTBUG-35958 Change-Id: I998cf93232e79f70837cfa8f63592b69ea0dc563 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | QLogging: Avoid infinite loop in error caseEl Mehdi Fekari2014-02-021-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user code installs a message handler that uses any API that prints logs (handled by qt_message_print) then this will lead to an infinite loop. This patch adds a thread local storage to check if the message handler is done before the thread is calling it again. Note: This check is performed only if the compiler supports thread_local (__declspec(thread) for MSVC). Change-Id: I43b0460b8f39b26a18de48a5652a5e55f0b336f8 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Fix QByteArray documentation w.r.t. QString-related methodsGiuseppe D'Angelo2014-02-011-18/+12
| | | | | | | | | | | | | | | | There's no loss of data when converting a Unicode string to UTF-8, so don't state that in the docs. Change-Id: If26914ec674a994d9c59136448e8e4292d0412e8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | CMake: don't require GL when build with -no-openglPeter Kümmel2014-02-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-36509 Change-Id: I03451527ab91754d87ff2a43985952c7c7641826 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add the default argument for the new connection syntaxThiago Macieira2014-02-011-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-36549 Change-Id: I3addacf4b0698df91960f7b8e9c2ed93e935f848 Reviewed-by: Branislav Katreniak <katreniak@gmail.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Update some more screenshots in qtbase/examples/widgets.Mitch Curtis2014-01-314-0/+0
| | | | | | | | | | | | | | The screenshots were taken on Windows 7 with the Aero theme. Change-Id: I2517664e25389f4fb87408daec7b720dfb785bf0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: corrected link/example errorsNico Vertriest2014-01-3118-22/+22
| | | | | | | | | | | | | | | | | | | | | | Update pro files after move gestures folder Update snippet statements Corrected path in imagegestures.pro Task-number: QTBUG-34749 Change-Id: Icc19908914e36507e412ab63bf0cc2809aa48e17 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Update some screenshots in qtbase/examples/widgets.Mitch Curtis2014-01-318-0/+0
| | | | | | | | | | | | | | The screenshots were taken on Windows 7 with the Aero theme. Change-Id: Ief04c3a9c0084a778606ba72f1f3199119d5c64e Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Upgrade Window Level for stay on top widget on OS XSamuel Gaist2014-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently setting the WindowStaysOnTopHint makes the window appear over its children e.g. a QMessageBox. This patch aims to provide a more sensible level for stay on top widget [ChangeLog][QtWidget][OS X] Fixes an issue where stay on top widgets would cover their own children Task-number: QTBUG-36178 Change-Id: Ie86b0e0244d2fdee3638d4ab576445ef190d4bc6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Build on Windows Embedded when -qtlibinfix is usedAndy Shaw2014-01-312-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The resource file that needs to be included is hardcoded whereas qmake generates one that is based on the target name (which includes the libinfix). So to ensure the right one is available, a copy of the generated rc file is done to the name it expects. [ChangeLog][Platform Specific Changes][Windows Embedded] Fixed building issue when configuring Qt with -qtlibinfix Change-Id: I46ddbc5d22424bf63c54423618385e4268790eeb Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
* | Documentation: a singular subject takes a singular verb.Bastiaan Veelo2014-01-311-1/+1
| | | | | | | | | | Change-Id: I75762cd0f2c25eeeeb1283800c21393637bdff56 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Also register complex D-Bus types when running under qdbusThiago Macieira2014-01-311-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running inside qdbus, we generate the meta objects a little differently. Previously, for unknown types we'd simply have a -1 as the type ID in the meta object, but this doesn't work in Qt 5 (has apparently never worked). So simply register a type with the metatype system and let QMetaObject do its thing. [ChangeLog][qdbus]Fixed a bug that caused the qdbus tool to crash when trying to display remote interfaces that had complex types without a matching base Qt type. Task-number: QTBUG-36524 Change-Id: Ifef65b340dc89d3295ed6ef00f2dcc60849ecb02 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Doc: argument(s) was renamed to value(s), adjust QCommandLineOption docsDavid Faure2014-01-301-3/+3
| | | | | | | | | | | | Task-number: QTBUG-36264 Change-Id: I132270f35b93b2b1c5230459f48bf9d047f42ab9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | QNX: Fix build on Win32 when linking against sqlite libsWolfgang Bremer2014-01-301-1/+1
| | | | | | | | | | | | | | | | Previously the linker options were overquoted which resulted in a broken Makefile. Change-Id: I2a77ad07564fc75533d6e8f29b5cbe52389bcce5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | set empty PDB file name in release config of VS 2012 vcxproj filesJoerg Bornemann2014-01-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | In release configs qmake sets DebugInformationFormat to None. If ProgramDataBaseFileName is left unset, then VS 2012 will always rebuild the complete project. Therefore, qmake now inserts an empty ProgramDataBaseFileName tag if DebugInformationFormat is None. Task-number: QTBUG-35570 Change-Id: Ifb91b0bbcf6614621bfe3b12429e2624bd16e77a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Load all available pixmaps in an icon file.Bastiaan Veelo2014-01-301-26/+30
| | | | | | | | | | | | | | | | | | | | | | Fixes the problem that only the first icon would be read from an .ico file with muliple icons of various sizes in it. Task-number: QTBUG-28267 Change-Id: I50daa89769054234e9ffc5246f59b46975948871 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | QPlainTextEdit: set Qt::ImhMultiLineRichard Moe Gustavsen2014-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Like QTextEdit, QPlainTextEdit should also set the input method hint Qt::ImhMultiLine. An important reason for this, is that the iOS plugin will inspect the input method hints of the focus object to decide which type of keyboard (and return key) to use. Failing to set this hint will result in the iOS plugin setting the return key to 'done' instead of 'return' for this widget. Change-Id: Idd5aaf21505add608f2621f94655984f42e92a18 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Remove duplicate move assignment operator docMorten Johan Sørvig2014-01-301-8/+1
| | | | | | | | | | | | | | Keep the "since 5.2". Change-Id: I8cfaf81e0b10f67c084e923f846ce0c722eac7fe Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | QFileSelector: correct the macro for android platformLiang Qi2014-01-301-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-35073 Change-Id: I50d254ae61dac3cedc11291bd5ed35f9f9447622 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Remove unused variableFrederik Gladhorn2014-01-292-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This fixes clang a clang warning: src/plugins/platforms/kms/qkmsscreen.h:114:18: error: private field 'm_refreshTime' is not used [-Werror,-Wunused-private-field] unsigned int m_refreshTime; ^ 1 error generated. Change-Id: I850f676abbde595963373afaf630307042dbf5a7 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Enable running sql model tests in parallelFrederik Gladhorn2014-01-294-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each model test gets its own temporary directory, thus there is no problem parallelizing them. This should reduce the time spent for a testrun of qtbase by around 3 minutes. When running only the sql tests it saves less since there are no other tests to run in parallel. === Timing: =================== TEST RUN COMPLETED! ============================ Total: 4 minutes 43 seconds Serial tests: 4 minutes 42 seconds Parallel tests: 1 second Estimated time spent on insignificant tests: (no time) Estimated time saved by -j4: 1 second === Totals: 12 tests, 12 passes ================================================ After: === Timing: =================== TEST RUN COMPLETED! ============================ Total: 4 minutes 7 seconds Serial tests: 50 seconds Parallel tests: 3 minutes 17 seconds Estimated time spent on insignificant tests: (no time) Estimated time saved by -j4: 1 minute 23 seconds === Totals: 12 tests, 12 passes ================================================ Change-Id: I355ceed62fae852ad8cd442848e263438afb738e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | QNetworkDiskCache - fix leak of file descriptorJungo Kim2014-01-291-0/+14
| | | | | | | | | | | | | | | | | | When the caches is deleted, the open files are deleted without closing action. The file descriptor is remaining until the process is terminated. Change-Id: If85519d173d05548ddf3273c85800441887199e2 Reviewed-by: jungo kim <jungo.kim@lge.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Cocoa: Silence tablet event warning on 10.6Morten Johan Sørvig2014-01-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | 10.6 sends tablet events for trackpad interaction, but not proximity events. The reason for this is not known. The events are discard. Silence the warning to avoid flooding the console. Change-Id: I6c215e8c15fc5b4b80e68b00f172121fc4d251b7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-2710-106/+210
|\| | | | | | | Change-Id: I4680723bef393a15d5aa63b9dd7d5fbb599bd9fa
| * X11: build again on Linux distros that don't have XInput 2.2Shawn Rutledge2014-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | fixed1616ToReal is needed by the XI2 tablet event debugging added in ecf11d62fc6f57cccf6f3326e768b1c7cabbd0b3, so it needs to be available if tablet events are supported and XI 2.2 events are not (older Linux distros). Change-Id: Id763d585790a9f037abc408dfba4ab5eec6dd421 Task-number: QTBUG-36437 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
| * Doc: Remove section on how build the MySQL driver for MinGW usersKai Koehne2014-01-251-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | The section is clearly outdated. It references MinGW from mingw.org, which we don't support anymore. With a more modern MinGW you can just use the recipe to link against the prebuilt binaries the same way we do describe for MSVC. Task-number: QTBUG-17268 Change-Id: I15b96fd328605b60d1494a703b9005e2c16aea39 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added more information about the WriteOnly modeVenu2014-01-251-2/+3
| | | | | | | | | | | | | | Task-number: QTBUG-34336 Change-Id: I4a9995dde400145cb1e33e625715eea8aaed3191 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * add buildsystem changelogOswald Buddenhagen2014-01-241-0/+12
| | | | | | | | | | Change-Id: I84ad3008b7c8431e0874e51b0cdfb677b7ffcb8a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * move qprocess changelog entry to windows sectionOswald Buddenhagen2014-01-241-4/+2
| | | | | | | | | | Change-Id: I0b0475ddd72491cf7b2cef304c434d2311640b84 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Updated the list of examples tagged for AndroidVenu2014-01-231-28/+7
| | | | | | | | | | | | | | | | | | | | Tested the examples that are tagged for user experience and relevance for mobile devices, and updated the list accordingly. Task-number: QTBUG-34805 Change-Id: I1ccd23fa626deb42c0fea4e03a2bf7a8dd2a856c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Add Qt 5.2.1 changelogThiago Macieira2014-01-231-0/+154
| | | | | | | | | | Change-Id: I0390aa8ff05270a8b6fe63e729b3f45dcc05275e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Don't allow the QLibraryStore to be recreated during shutdownThiago Macieira2014-01-221-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QtCore's global destructors are run, they delete the global QLibraryStore qt_library_data and set the pointer to null. If something happened to call QLibraryStore::instance() later, it would be recreated and then weird things might happen. So prevent that from happening. That usually cannot happen, since the only thing that can run after QtCore global destructors are other QtCore global destructors or global destructors from libraries that do not depend on QtCore. So we're reasonably safe. There are two conditions in which something could run after QLibraryStore::cleanup() and still try to access QLibraryStore: 1) indirect dependency, like a global destructor from a library that doesn't depend on QtCore running code from another module that does. 2) static builds of Qt modules. In that case, the order of the global destructors is totally arbitrary and we could get one from a module that depends on QtCore running after QtCore's. That is the case from the bug report. Task-number: QTBUG-36294 Change-Id: Id199671275fd2535acf2d158857ce46b474e579b Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * fix VS 2010 project file generation for release modeJoerg Bornemann2014-01-221-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | VS 2010 doesn't denote "no debug info" as "None" but as empty tag. This fixes a regression introduced by 7c3efdfb6ad72955543128a5a13e3f45ef3ee7af. [ChangeLog][qtbase][qmake] fix VS 2010 project file generation Task-number: QTBUG-35610 Change-Id: I18ae69a842d0b679a781f8d24c026d422da3a857 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * Mac Style: Fix non-native menubar item spacingGabriel de Dietrich2014-01-222-0/+9
| | | | | | | | | | | | | | | | | | | | | | Unfortunate consequence from inheriting from Common style instead of Windows style. Also, a font entry missing in QCocoaTheme. Task-number: QTBUG-36224 Change-Id: I560494b1727734671478f70ee1ba800d21c916ca Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Replace @BUNDLEIDENTIFER@ in Info.plistMorten Johan Sørvig2014-01-221-0/+4
| | | | | | | | | | Change-Id: I34aa77fc51b1ae4d7941f01fcb20236250454d19 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Doc: Remove unused defines from global template.Jerome Pasion2014-01-271-6/+0
| | | | | | | | | | | | | | | | -Qt NFC and Qt Bluetooth no longer need them Change-Id: Ie198cfc3d5171c04cdd2c36b83ec5f1718e16972 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix typo in the function argument of QRect::moveTo: t -> yThiago Macieira2014-01-271-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-36259 Change-Id: If6f8da7f36d9a2bc171f2f50d36b37af8f13d8d0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | evdevtouch: Don't try to keep reading on EAGAINRobin Burchell2014-01-241-26/+47
| | | | | | | | | | | | | | | | This stops touching the screen (and not moving) consuming 80-90% CPU. The mtdev and non-mtdev codepaths have been separated for additional clarity. Change-Id: I0559a6bd80dab961fdb4a83ad50860a9aec6445c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Remove invalid comment from qabstractanimation_p.Jędrzej Nowacki2014-01-241-2/+2
| | | | | | | | | | Change-Id: I4087c80061ad2fd9458730e4e3515eb4695c8b14 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Remove obsolete parts from QNAM documentationAlex Blasche2014-01-241-6/+1
| | | | | | | | | | | | | | | | Meego/Haramttan is no more and QtMobility only works for Qt 4.x anyway. Change-Id: I3840358011f9d0e14de4d0ce9de15bba546964c5 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Make the QEXPECT_FAIL agree with the QVERIFY2 condition belowJan Arve Saether2014-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the system is not under high load, this test can generate 4 updates on Windows. This is seems to be because the timer actually triggers before its supposed to (sometimes the second start() triggers an update right before the animation is done (at timestamp 399 for instance), forcing it to generate yet another timer event in order to reach the end)). Under high load conditions, too many things can break this test, usually it finishes even before the pause(), causing the QVERIFY(animation.state() == QAbstractAnimation::Paused); to fail. Change-Id: Id94c0d16656675bc6165b7795f3c41a30616a3ba Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Cleanup of the android clipboard handlingSamuel Gaist2014-01-232-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's an unguarded class member for the clipboard, allocated but unused and not deleted in the destructor. The getter creates a static clipboard allocated on the heap. This patch aims to add the missing guards as well as use the class member. Task-number: QTBUG-36025 Change-Id: I86969390eebcd67b65707e3ecbd4b3be15c7dadb Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Revert "Fix mix of new[] / malloc in QTest::toHexRepresentation"Thiago Macieira2014-01-231-3/+4
| | | | | | | | | | | | | | | | This reverts commit e8f73d656cf13d440a3a83980e05c6b117489e40. The original was correct: qtestcase.cpp:282 and 283 use delete[]. Change-Id: I668e17f500edcf9f1406553a160f6f5518dee148 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | ensure that output path is normalizedOswald Buddenhagen2014-01-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-35131 Change-Id: I39b345db649470a926e25eb2a9b38794205b9212 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Doc: corrected broken linksNico Vertriest2014-01-235-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Links fixed: Extra Filters Basic Tools blockingfortuneclient Thread Support Drag and drop examples qBinaryFind qmake common project types imagegestures Task-number: QTBUG-34749 Change-Id: Ib93dda00716dc596db327fee5b97e110a9f27fa7 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | QAbstractSocket: make build with debug statements compilePeter Hartmann2014-01-231-1/+1
| | | | | | | | | | | | | | | | Otherwise we would get qabstractsocket.cpp:2224:24: error: unknown escape sequence: '\c' [-Werror] Change-Id: I757ff2aa1c46bbba7f0c0b93f49c2f9d84927b19 Reviewed-by: Richard J. Moore <rich@kde.org>
* | Don't include <gnu/lib-names.h> when compiling with uClibcJorgen Lind2014-01-232-2/+2
| | | | | | | | | | Change-Id: I5264280b7ce1e94eaf410a070f9670984f7a655b Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | EvdevTouch: Don't remove released touch data for Type B; only ignore slotRobin Burchell2014-01-221-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | The Type B protocol states that touch slots with an ID of -1 should be considered unused, but data should be retained if that slot becomes active again later. Instead of removing the contact from the contact list, only "disable" it. This contact can later be reused if the slot becomes active again. Change-Id: I827ae311841dd97f73a2c64d943658cd3f29eaf8 Done-with: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Do not overwrite basePixmap of QIconLoader PixmapEntryAlbert Astals Cid2014-01-222-3/+6
| | | | | | | | | | | | Change-Id: I4799af1d9151ba4b0952369e9620d2fab2b002d9 Reviewed-by: David Sansome <me@davidsansome.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-01-2227-71/+257
|\ \ | | | | | | | | | refs/staging/stable
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 18:18:26 +0000