summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Adding navigation configs in the module qdocconf files.Jerome Pasion2013-06-2512-2/+37
| | | | | | | | -The navigation bar requires the titles of the landing page and relevant pages. Change-Id: I5d5986b2bf74205cd49957b63fd6ac4e32cbb36b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Make the qfatal for redeclaring a type with the same name a warning.Richard J. Moore2013-06-251-5/+5
| | | | | | Change-Id: I5a25b2043a6b5a598a004d30c9a8056564c136e3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* QCommonStyle: use RSIP_OnMouseClick for SH_RequestSoftwareInputPanelRichard Moe Gustavsen2013-06-251-4/+0
| | | | | | | | | | Both Android and iOS needs the style to use RSIP_OnMouseClick (and qwindowscestyle and qwindowsmobilstyle as well, it seems) so set it as default (instead of expanding the #if test even more). Change-Id: I93a78e11031b506c2cb80f30f1946fe25f7945a9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-24197-736/+7311
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-20197-736/+7311
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| | * Doc: Fix spelling errorDebao Zhang2013-06-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I9225ffeddfe17bc4f56ecd9a9c4656403840f828 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Doc: QTranslator::translate() isn't an overload anymoreDavid Faure2013-06-191-2/+0
| | | | | | | | | | | | | | | | | | Change-Id: Ib50044da48be3fb4f43300aa285e15403bd8d65e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * hide placeholder text when QLineEdit has preedit textTasuku Suzuki2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ica84e9ce715702b690906ef748970e16d9162c4b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Aurélien Gâteau <agateau@kde.org>
| | * Doc: remove the duplicate for in QStyle documentationLiang Qi2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31739 Change-Id: I72ad52da7d7e6899148a91d22266e79dd3184d4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * fix auto-enabling of windows styleOswald Buddenhagen2013-06-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | it needs to come after the vista and xp style blocks. Change-Id: I66b5c1eff41b19a76802a77b6926552d7343b29c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * remove pointless positive QT_FOO_STYLE definesOswald Buddenhagen2013-06-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | they are not used. only the negative QT_NO_FOO_STYLE defines are used. Change-Id: Ic39081240c78cf66bd50c300b4aad04abca6f38c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * don't claim that mac style needs windows styleOswald Buddenhagen2013-06-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | we have commonstyle for that for a while now. Change-Id: I1ab3c86af994fc9cc7aaf65d28a2428b5e02be99 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * catch accidental use of -no-makeOswald Buddenhagen2013-06-191-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | the option the user most likely meant is called -nomake. Task-number: QTBUG-21778 Change-Id: I6d8c4d5a984c929804f49ffc2ac75f6945f76e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * complain about bad arguments to -make/-nomakeOswald Buddenhagen2013-06-193-2/+24
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * QNX: Fix screen rotationRafael Roquetto2013-06-192-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior introduced by qtdeclarative's 475d1ed4f6a2 mandates that an expose event follows a geometry change event. The fix for this uncovered a bug on the raster backing store which caused the rotation to break on QtWidgets. The problem was rooted on the assumption that the QQnxRasterBackingStore::flush() method was only called after paints to the backing store surface, which was discovered to be a false assumption. Flushing the backing store can occur in other circunstances, which are out of scope on the context of the QNX plugin. Task-number: QTBUG-31329 Change-Id: Icfc3e85324f5a8745f6b5f189f27f8b763f770c7 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * QNX: Add option to disable screen power save from an envvarSean Harmer2013-06-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt itself has no API for disabling screen power save, although this might make an interesting addition at some point. Instead we make the QNX QPA plugin determine if power save should be disabled from the QQNX_DISABLE_POWER_SAVE environment variable. This would typically be set in the application's bar descriptor file. Change-Id: Ie195ecd0496efd533ad9a32b65883283f471c534 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * If a QWidget is ignored for auto-quit, ignore its corresponding QWindow.Stephen Kelly2013-06-194-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | Unit test by Friedemann Kleint <Friedemann.Kleint@digia.com> Task-number: QTBUG-31569 Change-Id: I526d33d4f88a41f6ac349098476bc45af6c841b0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Doc: added more details about contains(variablename,value)Nico Vertriest2013-06-191-2/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31428 Change-Id: Ie9b4a1f5392f24b5b0b2cb94115edd0814ba92d1 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Make PCRE's JIT work on Android devicesGiuseppe D'Angelo2013-06-193-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __clear_cache is missing from Android; use cacheflush instead. Backport in Qt's own PCRE copy of the upstream fix: http://vcs.pcre.org/viewvc?view=revision&revision=1340 Task-number: QTBUG-31754 Change-Id: I4996265f7b19343ba24983d4f8b2f75e2b578504 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Add note to remove unused private field.Stephen Kelly2013-06-191-1/+8
| | | | | | | | | | | | | | | Change-Id: I33c831de1eb6b687a9c033f83bc266bd33a3540e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix QSpinBox clipping issue on Mac when frame=falseJens Bache-Wiig2013-06-191-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression from 5.0. Since we still require a minimum height to be present in order for the spin buttons to draw correctly, we require the same height from a spinbox without a frame as one with a frame. task-number: QTBUG-31538 Change-Id: I999f59a29e826e8e621faebffce9cccd9bedb8ca Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Ensure we don't repeat QTBUG-30931 in Qt5Konstantin Ritt2013-06-182-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is already fixed in 5.0 but let's be nice and ensure the issue won't be reintroduced later. Task-number: QTBUG-30931 Change-Id: Ia6944acaf6e7217f8d0f1fa75d0e9977db11d892 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: there is no Q_OS_X11 (and has never been)Thiago Macieira2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change the example to Q_OS_UNIX. Change-Id: I8aed12237408a0e526839a96867aceae33b993b9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Make qtbase compile with QT_NO_TRANSLATIONTasuku Suzuki2013-06-185-87/+2
| | | | | | | | | | | | | | | Change-Id: Iaa52ba41218b3ec8f36f0052230e0c2cc31c3ba5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * BlackBerry: fix tst_qlistviewRafael Roquetto2013-06-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Because fonts are bigger on BlackBerry than those assumed when the test was written, explicitly adjust the font size on this platform. Change-Id: I6a23c28c2d32edf744dd5de09ea0a97fd5f9b6d6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix tst_qlistview for full screen platformsRafael Roquetto2013-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some test cases rely on the fact that show() is not fullscreen, which may not be true for some platforms. Explicitly make use of showNormal() to avoid full-screen show on these platforms. Change-Id: Ie62fe21bf0f466c561a27cffda99d0201b4a45af Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
| | * Fix tst_QWindow for fullscreen platform pluginsRafael Roquetto2013-06-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests assume that QWindow::show() behaves like QWindow::showNormal(), which is not true for platforms in which the show is fullscreen, forcing QWindow::showNormal() to be explicitly called. Change-Id: Ib5f23a4d01bc6a3a2973f57488996c8c198c45f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * QMacStyle: enable scroll style changes for non-QScrollBarsJ-P Nurmi2013-06-172-3/+17
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31537 Change-Id: Iee2148609df5cb2c121da4088bcd79f26c2eedc4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * remove pointless return code checkingOswald Buddenhagen2013-06-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | qtAddModule() always returns true anyway. the real checking is done by qtAddModules() and qtAddLibrary() itself. Change-Id: Ieed821acc36dc57ca52aec3e6b2dd6513be9b6c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * make use of QT_MODULES to simplify codeOswald Buddenhagen2013-06-171-3/+2
| | | | | | | | | | | | | | | Change-Id: I1124088f807023faf678e030cfb1fc4a4c8b40d7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't try to not build non-existing partsOswald Buddenhagen2013-06-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I20896f15f7ab91aac8a9b6977fd3a253bc0e187d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't claim that "make install" is needed for non-prefix shadow buildsOswald Buddenhagen2013-06-171-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I3a72fa8f5f849fba1a4bc79788b090c1a23b0198 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * normalize file list assignmentsOswald Buddenhagen2013-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not quoting the variable references allows the shell to word-split the contents and thus convert the embedded linebreaks into spaces. Change-Id: Id834f02d7a501fb6fe48b45f409f599a8b70b7ed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't write unused QT_INSTALL_* to qmake MakefilesOswald Buddenhagen2013-06-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | the installation has been moved to the qtbase top-level project a long time ago. Change-Id: I25f1658d1a6544da4bdaa5be6b19f9076c19b7f9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * wrap the horrendeous monster switch caseOswald Buddenhagen2013-06-171-1/+39
| | | | | | | | | | | | | | | | | | Change-Id: Ia8619a9e75006d9a95ae325de7aa326b5dd928a6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * update commentOswald Buddenhagen2013-06-171-4/+3
| | | | | | | | | | | | | | | Change-Id: I6e5e53d0c7c48a3b859bc61299456f97a209af2a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * make images non-executableOswald Buddenhagen2013-06-1718-0/+0
| | | | | | | | | | | | | | | Change-Id: I7d6c28e7fd18125c95e56eca2d0d6d67003f9c5d Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * move qmake docs into qtbaseOswald Buddenhagen2013-06-1737-0/+6153
| | | | | | | | | | | | | | | | | | | | | | | | as of qttools/18a5e89623815f5355b4173a2e93609eb10289d1 Change-Id: I75cb55e0c404449a4e0d963e09185287a3f6343e Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| | * Remove use of 'register' from Qt.Stephen Kelly2013-06-1747-375/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is deprecated and clang is starting to warn about it. Patch mostly generated by clang itself, with some careful grep and sed for the platform-specific parts. Change-Id: I8058e6db0f1b41b33a9e8f17a712739159982450 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Make qtbase compile with QT_NO_TEXTCODECTasuku Suzuki2013-06-178-1/+43
| | | | | | | | | | | | | | | Change-Id: I1614dc08c0dd1950020e415f37c97160431b2336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Recognize separator item in QMenu.Leonard Lee2013-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse over event on upper level menu separator should automatically close the sub menu listing. Manual test is not needed for this commit since it is easy to test it against common examples. Task-number: QTBUG-31664 Change-Id: I323d7ba206352a5d533584543b9a2ebf842b4dfc Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Cocoa save file dialog behavior fixSamuel Gaist2013-06-161-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, in save mode, if selectFile has not been called, the native cocoa file dialog puts the folder name in the line edit. This patch restores the old behavior where the line edit is presented empty to the user. Task-number: QTBUG-31619 Change-Id: I938eb6d968e0e2c343e70bc19f29663e112d0496 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * Fix for OS X QFileDialog showing bundle as directorySamuel Gaist2013-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also check if the selectedFile is a bundle to correctly set currentDir. Patch for Qt 4.8 has been submitted Task-number: QTBUG-31562 Change-Id: I72b0e8484b3c3a610932c03cd7fdab4ddee70277 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * Make qtbase compile with QT_NO_XMLSTREAMREADERTasuku Suzuki2013-06-162-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | D-Bus depends on QXmlStreamReader instead of QDom Change-Id: Ic435970af21ac6e45c4100359ff54bd5793ccce2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * QKdeTheme: generate sensible disabled colors for the system paletteJ-P Nurmi2013-06-161-0/+36
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31670 Change-Id: Icbd2f35d9c2f5c1ef05c9dfeae4922be01ff2751 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Read SingleClickActivation from KDE settings fileDominik Holland2013-06-161-0/+6
| | | | | | | | | | | | | | | | | | Change-Id: Ia2ccea89cefb85a7641628d32f925b32ecd6bdc6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-1546-185/+325
| | |\ | | | | | | | | | | | | refs/staging/stable
| | | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-1246-185/+325
| | | |\ | | | | | | | | | | | | | | | Change-Id: If29ca1b27da4592d40a7678837c359f75dac1209
| | | | * Fix xkbcommon.pri not to override QMAKE_CFLAGSJ-P Nurmi2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31585 Change-Id: I6628a8eececc34aef4cd358ad2c8b246d8845602 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| | | | * remove overquoting of extra compiler argumentsOswald Buddenhagen2013-06-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake automatically escapes the ${expandos}. Change-Id: If74b6d2f2c68ff50785fdcbb66351122a273051f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 01:04:40 +0000