summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Testlib.selftest: Improve process execution, run on openSUSE.Friedemann Kleint2013-11-191-23/+45
| | | | | | | | | | | Give processes a more complete environment (openSUSE requires more variables to start an X11-process), add test column indicating whether a test is supposed to crash. If it is not, report crash reason. Change-Id: I1e0ad59824963f69ee425f331d845741be2b3928 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Clear focus from active widget when windowcontainer gets focus.Gunnar Sletta2013-11-191-0/+5
| | | | | | Task-number: QTBUG-31853 Change-Id: If0d29ee0a125464b32be99332502473b7c626bb0 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* XCB: do not assume that sizeof(long)==4Alberto Mardegan2013-11-192-8/+8
| | | | | | | | | | | | The code was using the "long" type when a 32 bit type was actually needed. This can cause bugs in those systems where "long" is 64 bits wide, such as Linux x86-64 (which is LP64). Task-number: QTBUG-34861 Change-Id: Iab289b2af3847dd62d8b4ecea51896936ca4c7a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* mkspecs: add qfeatures.pri to installed filesPeter Hartmann2013-11-191-1/+1
| | | | | | | | | ... so it will be found when included. That file was added with commit 3b6b615334713cbfeb43409ff104244b55f4ce1f, "export QT_NO_<foo> equivalents to the build system" Change-Id: I38208aafe5b274d5976cec5d5149a41e6a963798 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix configure script to not dictate OpenGL ES 2 when EGL is enabledJorgen Lind2013-11-191-27/+7
| | | | | Change-Id: I4d940ef436f21fd915f3d03558fd4fb4c7b3e5b7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Remove the GLES 2 dependency for eglfs and kmsJorgen Lind2013-11-199-11/+31
| | | | | Change-Id: If7b80487e01db726367f5a67d2860073f60a0844 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Widgets: Never revoke focus by click on focused widget.Christoph Schleifenbaum2013-11-182-0/+68
| | | | | | | | | | | When clicking on a widget currently focused, w/o having Qt::ClickFocus set as focus policy, the focus should stay on the widget and not get propagated to the widget's parent. Task-number: QTBUG-34042 Change-Id: I53f1153829cc7228de02a90e38125b5cf4ee5008 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Windows: Fix bug where windows stopped painting after a restore.Sérgio Martins2013-11-181-0/+2
| | | | | | | | | | | | | | This is an improvement over 6800728d where we only fixed it if the window was in "normal" state (Qt::WindowNoState) before minimizing. With this patch, if the window was previously maximized or full-screen it will also get the expose events when being restored. Change-Id: I4a30423145e0999c5d0a5ee2a989730b83f4e3f2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* QHeaderView - do not ignore -1 as minimum section sizeThorbjørn Martsum2013-11-172-1/+3
| | | | | | | | | We claim that -1 is a special automatic value, but calling setMinimumSectionSize with -1 is unfortunately ignored due a regression in 524c3e05e811d81fbcd71eedb377b7eaa0a21ef3 Change-Id: I7d7e5dbbf78e561849d2f2352c9edb2df36aa181 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QCommandLineParser: add word-wrapping algorithmDavid Faure2013-11-173-27/+82
| | | | | | | | Rather than breaking at column 79 precisely, break entire words, to improve readability. Change-Id: Ie30db00f0e6ed95cce87480c3b91804826c6076b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Stabilize tst_qabstractitemview.Friedemann Kleint2013-11-161-33/+106
| | | | | | | | | | Center windows on screen to avoid conflicts with Unity taskbars, observe minimum geometry for Windows, move cursor out of the way for Mac. Introduce QScopedPointer to ensure cleanup in case of failures. Change-Id: Ic169e015e795597457b8e85a28ff7fcb7b9b9430 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Improve interaction between QPlatformTheme and QPlatformIntegration hinting.Michael Brasser2013-11-151-1/+27
| | | | | | | | | | | Ensure that custom style hints returned by subclassed QPlatformIntegration::styleHints() are used if not explicitly overridden by subclassed QPlatformTheme::themHints(). Task-number: QTBUG-34589 Change-Id: I0a3114cb00b532d2a5cd40941eca192b32412bcf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Don't accept wheel events if sendEvent() returns false.Sérgio Martins2013-11-151-2/+3
| | | | | | | | | | | | | Otherwise wheeling over disabled items won't let the wheel event propagate to the parent. An easy way to reproduce the problem is by having a flickable with some disabled item in it. Task-number: QTBUG-33477 Change-Id: Ib327cc34dd9f415617ffbc41064f689507446c05 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Remove QTRY_ macro from tst_qabstractitemview.Friedemann Kleint2013-11-151-13/+2
| | | | | Change-Id: Ic8b8e5c242b640581aa735a3716666d4e7ff44eb Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QFormLayout: Avoid assertion with negative spacings.Jan Arve Saether2013-11-152-1/+15
| | | | | | | | | | | | | It's not really clear if styles *must* return a non-negative value for QStyle::pixelMetric(PM_Layout{Vertical,Horizontal}Spacing), but both QBoxLayout and QGridLayout seems to be robust enough to handle this. They will simply make sure that the spacing is never negative. We therefore make QFormLayout equally robust. Task-number: QTBUG-34731 Change-Id: I62235bfcd8adf7757cf15bc9927b29650ae6459d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Avoid compiler warning about alignment for MSVC2013 (x64)Jan Arve Saether2013-11-152-4/+12
| | | | | | | | | | | | | | Only align if we actually *need to* (due to SSE/XOP usage) The code will currently not compile as it is now with UseSSE or UseXOP defined, (so the ALIGN macro could just be totally removed). In order to keep the diff to upstream as small as possible, we keep the ALIGN macro definition. Task-number: QTBUG-34362 Change-Id: I6cf420205896e3a476cdcfbf3308a07e0ae0c84e Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QKeySequenceEdit: add to qfeatures.txtMarc Mutz2013-11-141-0/+6
| | | | | | | | | | | QT_NO_KEYSEQUENCEEDIT was only added to qfeatures.h whose removal killed the feature. Change-Id: I0644bcffdd814bb0bdb4c94d281d56fa3baff3a3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QKeySequenceEdit: simplify clear()Marc Mutz2013-11-142-9/+25
| | | | | | | | | As the test case shows, clear() is semantically equivalent to setKeySequence(QKeySequence()), so implement it that way. Change-Id: Id68edbbf85aac3bcff82c81310c38274ed8e6708 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Move MaxKeyCount from QKeySequenceEditPrivate to QKeySequencePrivateMarc Mutz2013-11-143-6/+8
| | | | | | | | | | | | | Adjust users and add a static_cast that MaxKeyCount be 4. That is instead of adjusting all the code to use MaxKeyCount instead, some of which cannot be thus changed (e.g. where using the QKeySequence(int, int, int, int) constructor). This was requested in the original review, but never implemented. Change-Id: I3812340890f4d75257139f04e73e83083ca09760 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Mark tst_qgl as insignificant in angle buildSimo Fält2013-11-121-0/+1
| | | | | | | | | All ci nodes are currently missing 3d support, when that is enabled this test will start to fail. Task-number: QTQAINFRA-711 Change-Id: Ie6b840e290a9371fa895681e58d6dedf55b777e6 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Refactor QQnxWindowFabian Bumberger2013-11-1113-485/+191
| | | | | | | | | | | | This patch does following things: * Remove the root window: First window which is created will serve as a root window * Allow creation of more than one application window (with every app window having an own window group) on one screen * Fixes a bug when reparanting an EGL window Change-Id: I1afd64a813bc084c0893b958aa191d4a25c32b9d Reviewed-by: Matt Hoosier <matt.hoosier@garmin.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Request the glyph at the right subpixel offsetGunnar Sletta2013-11-101-1/+1
| | | | | Change-Id: Iace18740565862f1c66e2d654a1a2e7bc1a16fc7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Force FT font engine to load the right glyph metricsGunnar Sletta2013-11-101-0/+12
| | | | | Change-Id: If027ea4c1a3b2ca8f972592abe3534165f62cf4e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Remove a boolean trap in QLayout::replaceWidgetGiuseppe D'Angelo2013-11-102-9/+19
| | | | | | | | | | Use some flags instead. Task-number: QTBUG-34668 Change-Id: I9a75253c8eb98164c594bb6bb06c1a16c9609537 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QKeySequenceEdit: give nested line edit an objectNameMarc Mutz2013-11-101-0/+1
| | | | | | | People request this, and other widgets do this, too (say, QSpinBox). Change-Id: I275537fb82b805b0dcb8edba87b8e234985f8d1f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QKeySequenceEdit: make setKeySequence a slotMarc Mutz2013-11-101-1/+1
| | | | | | | | | There's a signal keySequenceChanged(QKeySequence), so the setter should be a slot, too. Change-Id: I6591bad071444ffa252a2fdb9ccaf28e8629f59c Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Document the BC break of viewportSizeHint() in itemviewsGiuseppe D'Angelo2013-11-098-7/+35
| | | | | | | | | | | | Since users were not supposed to use this feature at all, just live with the BC break, but document it. In order to prevent possible problems in the future, introduce dummy overrides in QAbstractItemView and QListView as well. Also, fix the visibility of the overrides (it's protected, not public). Task-number: QTBUG-34667 Change-Id: Ib4554ae5e1e7d3ce4ea8e8703e1fea9e2231edb0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Android native message dialogBogDan Vatra2013-11-0915-11/+848
| | | | | Change-Id: Ief8c3ce3b8683c6960f046245844c1835a327d51 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Avoid signed integer overflow by making an addition a subtractionThiago Macieira2013-11-091-1/+1
| | | | | | | | | | | The task has a very good explanation. The use-case was ba.remove(n, INT_MAX); since you can't pass -1 to the length, and that results in overflow when you add n+INT_MAX. Task-number: QTBUG-34694 Change-Id: I365eb86b2d0dabbe0bde67e4e7f33d64fd5793af Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QTimeZone - Fix Windows Transitionsunknown2013-11-091-63/+89
| | | | | | | | | | The Windows tz transition routines were not checking for a number of invalid scenarios, in particular where there are no next transitions able to be calcualted, leading to infinite loops. Change-Id: I262b4321a95be1df4228774ada3908f8d3ed6c1a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QTimeZone - Fix Mac TransistionsJohn Layt2013-11-091-19/+38
| | | | | | | | Fix nextTransitions() where there are no next transitions and improve performance of previousTransition() and data(). Change-Id: I5d44525554243d139ba8d5f86e41bdfc0f7bfc25 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move QTreeView::accessibleTree2Index to the private classGiuseppe D'Angelo2013-11-083-11/+17
| | | | | | | It's not needed to expose that symbol. Change-Id: I65b752a41d80eb0779969fa3887c081b4c2c88db Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* QHeaderView - remove confusing boolThorbjørn Martsum2013-11-085-10/+9
| | | | | | | | | | It is probably better not to have a default boolean in QHeaderView::setResizeContentsPrecision Task-number: QTBUG-34665 Change-Id: I0bb2c35abc1d5713bb3ee65df3af86c04f175a38 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QSslConfiguration: rename [get]session() to [get]sessionTicket()Peter Hartmann2013-11-086-20/+20
| | | | | | | | to reflect the fact that this returns and sets the whole session ticket, and not just the session ID. Change-Id: I00fe2bc4197dbcd7a02b3ae4f2f84e3a2a7edad0 Reviewed-by: Richard J. Moore <rich@kde.org>
* iOS: Send expose event when a window changes the geometry.Maciej Kujalowicz2013-11-081-0/+1
| | | | | | | | | | | | | | | When the EAGLView view changes its layout, it must send the expose event along with the geometry change. It is important to notify the render loop of the scene graph that the windows's geometry has changed. The render loop is waiting for the WM_Expose event and updates the scene's window size accordingly. See QSGRenderThread::event for reference. Without this notification, the geometry of window is updated, but the scene is rendered incorrectly, for example when the orientation of screen changes. Change-Id: If102014313de455cb1f44d772b478d2feae6dacf Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Remove disused version of QPlatformMessageDialogHelper::clicked signalShawn Rutledge2013-11-081-1/+0
| | | | | | | | It has been replaced with a version that sends both the button and the role. Change-Id: I47156288bf2039cfdfd4cf09f75563347bfb4141 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Fix QFileDialog::getSaveFilename() with a given default nameShawn Rutledge2013-11-081-9/+10
| | | | | | | | | | The QFileDialogOptions::initiallySelectedFiles were overridden, and the given filename was also not properly converted to a local file URL. Task-number: QTBUG-34408 Task-number: QTBUG-34446 Change-Id: I51d05b954a5393d10db9232945ba05bda7068e73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Move threading overviews from qtbase.git to qtdoc.gitSze Howe Koh2013-11-085-1073/+1
| | | | | | | | | | | | | - This topic is relevant to multiple modules, as illustrated by the "Thread-Support in Qt Modules" page. Multithreading can be done in both C++ and QML. - Moving also fixes links to QML-related pages. - Snippets are copied, not moved. QThreadStorage docs need them. - QDoc: "DEPENDS += qtdoc" added to keep the "\reentrant" command working. It creates a link to the "reentrant" keyword. Change-Id: I2cdf6139e62d66911561c30fcca7aab160a694b1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Added some Qt Quick examples to manifest-meta.qdocconfGeir Vattekar2013-11-081-1/+14
| | | | | | Change-Id: Ie199b48faf885d9a50b7dfd8a73cc99e69998102 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Prevent clang from warning about unused variablesKai Koehne2013-11-081-0/+3
| | | | | | | | Fixes a compiler warning introduced by 79b975756a100cc46182 Change-Id: Ie9bc677d061f0bb0530eae88715069042b2ab440 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QVariant: Convert automatically from enum types to integral types.Olivier Goffart2013-11-082-12/+129
| | | | | | | | | [ChangeLog][QtCore][QVariant] Variant containing enum types can now be converted to integer Change-Id: Ibbbc9ae29ab45d67c582fa2d406afc19c5dc41ce Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix QVariant::canConvert with longlongOlivier Goffart2013-11-082-3/+28
| | | | | | | | | | | Add few cases where conversion to or from LongLong was missing We need to make it work if we want to use variant.canConvert<qint64> [ChangeLog][QtCore][QVariant] Fixed QVariant::canConvert with longlong Change-Id: I0f65073802b62d99250601dd90a8cd2e4d934b60 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Revert "Fix setVisible() of QWidget has no effect in QTreeWidgetItem"Friedemann Kleint2013-11-082-36/+1
| | | | | | | | | | | | It introduces QTBUG-34653 (Qt Designer widget box no longer repainted after collapsing items or using the filter). This reverts commit 04de24c6449422d29a0d4760375aa94f59222fa3. Task-number: QTBUG-13522 Task-number: QTBUG-34653 Change-Id: Ieb9766e7f15acea901fce4ad7142aa72557b9957 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* NSUrlConnection backend for QNetworkAccessManagerMorten Johan Sørvig2013-11-084-2/+558
| | | | | | | | | | | | | | | | Add support for QNetworkAccessManager https REST on iOS, without adding a dependency on OpenSSL. The current limitations are: - Overriding server certificate trust issues (for example expired certificates) is not supported. - Usage on non-gui threads is not supported. NSurlConnection needs a CoreFoundation-based event loop, which Qt currently only provides when using QGuiApplication on the main thread. Change-Id: Ic6f74591d40c3b2248ab81db12647e432377cd4f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Prevent a crash in QLayout::replaceWidgetGiuseppe D'Angelo2013-11-081-1/+5
| | | | | | | | Item might be null. Change-Id: Ia432a35cb1a6bb02ee056ff8ad44a9f35bdbc146 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Cocoa File Dialog: Remove sandbox-ufriendly file system watcherGabriel de Dietrich2013-11-081-44/+49
| | | | | | | | | | | | | | | | | QFileSystemWatcher causes sandboxing errors since its backend uses POSIX API in a relatively liberal way. Also, Cocoa already acts as a file system watcher, and calls -[QNSOpenSavePanelDelegate panel:shouldShowFilename:] on each file. From a logical point of view, caching the directory content can be replaced by testing the current file against the filter setting. We expect Cocoa to cache results, and by using NSFileManager things should remain relatively fast. Task-number: QTBUG-34107 Change-Id: Ia872b9b1244f7b390d173a498011379b9309b3c6 Reviewed-by: Cyril Oblikov <munknex@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix potential BC break in QColorDialog.Friedemann Kleint2013-11-083-47/+61
| | | | | | | | | | | Replace newly reimplemented virtuals in d928dbbc919f5f39af9ce5c69eb8e9ffa9da71d3 . Task-number: QTBUG-34663 Task-number: QTBUG-14332 Change-Id: Idb2cc2ec237c96f7157470728bb79ff3efc504d0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix potential BC break in QTabBar.Friedemann Kleint2013-11-082-18/+6
| | | | | | | | | Move code from mouseDoubleClickEvent() to event(). Introduced by 252bad7c589e03d3e12df02354b00a84d8e3159a . Task-number: QTBUG-34670 Change-Id: I98ed24f26977220cf03524cfe001524364473982 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* iOS: Cancel any active touches when destroying a QIOSWindowTor Arne Vestbø2013-11-081-1/+13
| | | | | | | | Keeps the internal state of QtGui sane when it comes to which buttons are active, etc. Change-Id: Ic63e74d2546469e085ec46b74f4cf159dd409b07 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* iOS: Detect/handle cancellation of subset of touch pointsTor Arne Vestbø2013-11-081-3/+9
| | | | | Change-Id: I0d345d07fe62a8c7844333bf1eed9be6d6fa432f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>