summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix outdated comment in kernel/qtranslator_p.h.hjk2012-11-231-2/+2
| | | | | Change-Id: I0e7cc1686c5bcce611e353987e41b4dae7af5c31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* docs: DBus: Remove ObjectTreeFrederik Gladhorn2012-11-231-28/+3
| | | | | | | | In 0696071316b3dacb8d1ca15a269e4f4215642b9d the ObjectTree class was removed. Change-Id: I9c7a505a597e7c2ed9243468faee931a481b1b22 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* docs: Remove doc for removed functionsFrederik Gladhorn2012-11-231-17/+0
| | | | | | | | In 3986b5127419dfd6db6ce667b2976d188e25d9be these two functions were removed. Change-Id: Ib38692099aee8f71a8ae0f7949b8fa90eddf6009 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* docs: Link to class overview for dbusFrederik Gladhorn2012-11-232-1/+4
| | | | | Change-Id: I15b3791861e393065817054965aec5c0a5ae4c7b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix selection in QTableView when rows and columns have been movedMiikka Heikkinen2012-11-231-8/+12
| | | | | | | | | | | | The determination of top left and bottom right model indexes for the selection used logical indexes, which resulted in selection truncating itself if the first or last row or column had been moved to different position on the table. Changed the logic to use visual indexes instead. Task-number: QTBUG-28009 Change-Id: I4eb9dab690dafda9d2ab7c452dd6271fad70cb30 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Added reference to W3C's XML specsNico Vertriest2012-11-231-0/+5
| | | | | | | Removed 's from title Change-Id: I7c44279aab02edd26e454da5f59f4a9a19eab18a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Prevent "number of sections exceeded" when compiling qmetatype tests.Mitch Curtis2012-11-231-0/+5
| | | | | | | | | | | | When compiling qmetatype auto tests with msvc2008 64-bit, I receive: qmetatype.h(383) : fatal error C1128: number of sections exceeded object file format limit : compile with /bigobj This patch follows that advice and adds /bigobj to QMAKE_CXXFLAGS. Change-Id: I05b3cf9dfdb6a93649c692e2df22365d200e6f2f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fixed excessive enter/leave events being generated with the xcb plugin.Samuel Rødal2012-11-231-2/+39
| | | | | | | | | | | | | | | | | | | | | When we get a leave event we peek ahead in the queue to see if there's an enter event already pending. If so we use QWindowSystemInterface::handleEnterLeave() instead of two separate window system interface events, so that you don't get leave and enter events for the whole parent chain when moving the mouse cursor between two neighbouring native child widgets. We skip VIRTUAL events as they are generated for parent windows, and we only care about the bottom-most window that is being entered / left. Qt can take care of the rest since it knows the QWindow hierarchy. We need to not skip leave events with detail set to INFERIOR, since Qt expects to get a handleEnterLeave() when the mouse moves from a parent window to a child window. Task-number: QTBUG-27550 Change-Id: I7457d2e59d8b694081f2e43a16cd2e58d769624e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not detect directories ending in ".lnk" as link files.Friedemann Kleint2012-11-232-1/+13
| | | | | | | Task-number: QTBUG-21863 Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Proper macro replacment and branch evaluationLars Knoll2012-11-235-83/+182
| | | | | | | | | | | | Correclty replace macros according to the C++ standard. Use the correct replacement method also to evaluate With this moc correctly processes boost headers. Task-number: QTBUG-27546 Change-Id: I001b3054c5fcdc34d46cfa53d1387bd19436f361 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Correctly expand arguments in function macrosLars Knoll2012-11-231-11/+12
| | | | | | | | Arguments in function macros are only expanded if they aren't used in conjunction with a # or ## operator. Change-Id: I8c80e11902a592128504c4637545e75866566965 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove additional whitespaces from the macro tokensLars Knoll2012-11-231-2/+24
| | | | | | | | | According to the spec, we should ignore whitespace tokens at the beginning and end of the macro definition. In addition, whitespaces after a # and around ## should be ignored Change-Id: I830d0f4aaed3bcfac345d7da6df65693ec3315b8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Emit destroyed() signal before children get deletedLars Knoll2012-11-233-1/+119
| | | | | | | | | | | Make sure we always emit the destroyed() signal before we delete our children. This wasn't working correctly for QWidget based classes, as the QWidget destructor deletes all children itself. Task-number: QTBUG-24672 Change-Id: Iecdff3489196271177edfeba1c4a2c5800e255af Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add VS manifest files to .gitignoreJ-P Nurmi2012-11-231-0/+3
| | | | | Change-Id: I3aea869d870bdba047b4e86d2034c25eb62075f8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Cleanup Symbian specific rules from .gitignoreJ-P Nurmi2012-11-231-29/+0
| | | | | Change-Id: I0a47ae19d327af54e54cca94a04d90b543855988 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix \brief for QEasingCurveLars Knoll2012-11-231-1/+1
| | | | | Change-Id: Ibb8ce4e87e6338cc9d436344d1336397db093cb0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QHeaderView - Fix auto-scroll on manual move on sectionsThorbjørn Lund Martsum2012-11-233-5/+26
| | | | | | | | | | | | | This patch fixes the manual move of sections when auto scroll is on. It is done in QAbstractItemView::doAutoScroll by letting the qheaderView use its parents scrollbars if they are childs of a QTableView or QTreeView. Task-number: QTBUG-993 Task-number: QTBUG-1103 Change-Id: I70d999d9a07c3566e42d01cc5ebb47a69a83d9d4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QAbstractItemView - prepare fix for auto scroll on sectionmoveThorbjørn Lund Martsum2012-11-231-10/+13
| | | | | | | | | | | | | There are no semantic changes in this patch. We just avoid many calls to horizontalScrollBar() and verticalScrollBar() by storing the result of them in local variables, that are used instead. This is just a prepare for auto-scroll when a user is moving a section. Change-Id: I4b3d3ecbf3a29992e6f578d4b0442d7f494125e4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Prevent easing example warnings.Thomas Hartmann2012-11-231-2/+19
| | | | | | | | | | | | | | examples/widgets/animation/easing was spitting out a lot of "QEasingCurve: Invalid tcb curve" warnings. The reason was that in case of the TCP curve we do not provide defaults. The function createEasingCurve() now provides reasonable values for the custom curves to show what is possible and how to use them. Change-Id: I880d8d0f0ce2872ce2019f7d2e000f4c4ce136e2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Cocoa: Make sure non windowed QCocoaWindows hide their content viewsGabriel de Dietrich2012-11-231-0/+4
| | | | | | Change-Id: I92b8600c513ba033c459b6911ca62fc31698dc4a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Cocoa: Make sure child windows' QNSView is properly releasedGabriel de Dietrich2012-11-231-0/+2
| | | | | | | | | | Child QCocoaWindows don't have an assigned NSWindow, but still get a QNSView as backing store. That QNSView is added as a subview to the parent window's QNSView. That would leave an unmanaged QNSView alive. Change-Id: I10f57fb971f7aa1e278bb0af4217052d1e4bb0bc Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Cocoa: QGLWidget draws wrong within QMainWindow on Mac OSRichard Moe Gustavsen2012-11-236-101/+125
| | | | | | | | | | | | | | | | | | | | | | | | The resons for this bug is that Qt can share the same backingstore between several windows (if they exist in the same hierarchy), but this was just not supported by the Cocoa plugin. This patch will make sure that we pay attention to which window the QCocoaBackingStore is told to flush, and forward this information to the QNSView that backs it up. Inside the views drawRect function we then take some extra steps to get the correct sub-part of the possibly shared backingstore image. This patch also does some effort to ensure that we recreate the backingstore image as little as possible, as we can often get several resizes to the backingstore before we actually draw anything. Moreover, by being a bit careful on how we tell UiKit to update the view upon a flush, we can minimize the number of drawRect calls (and then CGImageRef creations) we need to do. This patch actually ends up improving resize/repaint performance a lot as well. QT-BUG: 27390 Change-Id: I2c2a26b149fa855411b6bff8b9cc9a61694ae72f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Make widgetgrab manual test compile with 4.8 and 5.Friedemann Kleint2012-11-231-3/+14
| | | | | | | | Task-number: QTBUG-27333 Task-number: QTBUG-27550 Change-Id: Iceb2ded9deff1d375bf02b88e214da20901bfa0e Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* QtBase: examples/widgets/graphicsview/ codestyleDavid Schulz2012-11-2349-302/+296
| | | | | Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/painting code styleDavid Schulz2012-11-2337-264/+218
| | | | | Change-Id: I3d3c6f3bae20ac8383279437f8f89c92195a704f Reviewed-by: hjk <qthjk@ovi.com>
* Add nsOpenGLContextForContext to QCocoaNativeInterface.Zeno Albisser2012-11-232-4/+12
| | | | | | | | | | This change enables receiving the native NSOpenGLContext that is used by a QOpenGLContext. This clearly is non-public api that is only meant to be used as a last resort for cases where it is really necessary to get hold of a native context object. Change-Id: Iea7c6abb458acc7aa15926052673270d25d1d9d1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix race condition on d->state, by locking the mutex first.David Faure2012-11-231-3/+9
| | | | | | | | Detected by helgrind ./tst_qurl testThreads Change-Id: I0fe01153cd119741ce8a2bfe7dddead7c6ebf0b0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Made QMacStyle internalJ-P Nurmi2012-11-2322-367/+339
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy, pluginizing etc. without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QMacStyle directly. Change-Id: I44a2f5ee3fe08ecc837b593a2a2737eb90e8c267 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* tst_qlistview: remove redundant includeJ-P Nurmi2012-11-231-4/+0
| | | | | Change-Id: If33518159feb202fa041ac2809817dff5616249f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* tst_qwizard: remove redundant includeJ-P Nurmi2012-11-231-1/+0
| | | | | Change-Id: I837aed1e5e601e67105562df2764327b7e8c44a6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* xcb plugin: Move the include XInput2.h statementsThomas Senyk2012-11-231-5/+5
| | | | | | | | | | If the include of egl.h does nasty things with X11-defines (this happens with the imx6 gpu-drivers) errors are avoided if the include of XInput2.h is next to the other X-includes, and not after include of egl.h Change-Id: I182d0e1fcf3fa3e6abce880d34e63cc1d2ce8ed4 Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
* QTBF: Fix issue with no splitting the words at "." (FULL STOP)Konstantin Ritt2012-11-234-4/+64
| | | | | | | | | | | | As of Unicode 5.1, some punctuation marks were mapped to MidLetter and MidNumLet for better URL and abbreviations handling which caused "hi.there" to be treated like if it were just a single word; until we have the Unicode Text Segmentation tailoring mechanism, retain the old behavior by remapping (some of) those characters back to their old values. Change-Id: I49dea6064f2ea40a82fc0b1bc3c4f0b4e803919f Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)Peter Hartmann2012-11-231-0/+2
| | | | | | | | | ... so the compiler knows which instructions to generate and can optimize for the specific CPU. All BlackBerry platforms are Cortex-A9 compatible. Change-Id: I3fd22e63af12f704365f494bbb7138963b4c4ec7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make QtQuick documentation references workPaul Olav Tvete2012-11-232-3/+9
| | | | | | | | ...and add one where we used to say that QWidget is "the base class of everything that appears on the screen". Change-Id: I573d8162fd69b7bfc5b0305f3ed6530129386b78 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Mac: Fix compilation with -sdk optionEike Ziller2012-11-232-7/+6
| | | | | | | | | | | | The include paths that the mkspecs set into the OpenGL/AGL frameworks must take the SDK into account. (The headers in 10.8 have slightly changed wrt 10.7, leading to compile errors because framework style includes (<OpenGL/foo.h>) within the system headers are resolved to the SDK framework headers.) Change-Id: I6113cdb95b462d587f593682e03e81e920f3f672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Add pointers to the rich text documentation from mentions of rich text.Samuel Rødal2012-11-233-4/+8
| | | | | | | | | The QLabel documentation for instance is quite confusing since it talks about rich text without saying what it actually is. The QTextEdit documentation can also be improved by being more explicit. Change-Id: Ie718d170e18a0b713fe567fb707330d0085fb9e4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>