summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | test: Skip some more qsslsocket flaky testsSergio Ahumada2013-08-131-4/+9
| | | | | | | | | | | | Task-number: QTBUG-29941 Change-Id: Iaf1c4834ef36db284464184639a1ab00928510cf Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Fix ShortcutOverrid for Qt QuickFrederik Gladhorn2013-08-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tryShortcutOverride function needs to be called with the focus object. The same logic is in QGuiApplication::notify. Applications with QGuiApplication would therefore handle ShortcutOverride correctly where QApplication would not allow the override. ChangeLog: Fixed ShortcutOverrid for QtQuickControls. Now it is possible to assign a shortcut such as "b" and still type "b" in text inputs. Task-number: QTBUG-32928 Change-Id: I4f4ab82fd11f45174a4483a01bbbe8143dfe0724 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix QDialog position shift bug after resize.Balazs Domjan2013-08-131-0/+3
| | | | | | | | | | | | | | | | | | | | On Linux (XCB), resizing a dialog shifts its position. The fix corrigates the geometry of the dialog to the right values. Task-number: QTBUG-32473 Change-Id: I6d38539a3ebc3b95eacc7f13a76f83fc9e4d821c Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Make the QItemSelectionModel test widgets-independent.Stephen Kelly2013-08-133-54/+51
| | | | | | | | | | Change-Id: I695afe535ff291bc98f43185469a434cd9178926 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Reset the QItemSelectionModel when its model is reset.Stephen Kelly2013-08-131-0/+2
| | | | | | | | | | Change-Id: I12af41adb18a2ecf8825b23d5715766dcae55436 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | gdb_dwarf_index: Use a sed call that's more POSIX-compliant.Raphael Kubo da Costa2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | sed versions other than the GNU one often default to being POSIX-compliant, in which case "+" (with and without escaping) is always an ordinary character. Achieve the same functionality in a way that works with both GNU and BSD seds by using "xx*" insted of "x\+". Change-Id: I1d2576a8c0e17b31f01a44d9632c57991e53780d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | purge QT_{SOURCE,BUILD}_TREE from dictionaryOswald Buddenhagen2013-08-121-8/+6
| | | | | | | | | | | | | | both variables are available class-wide anyway. Change-Id: I97c13de9ead44638e9310b62f02d8cd1c910df94 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | bye-bye .qmake.cacheOswald Buddenhagen2013-08-123-29/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | well, not really - qt_parts.prf will still create one, but it will be empty. apart from being cleaner, this now finally makes it possible to load an unconfigured qt source tree into qtcreator without random parts of the tree being missing from the project explorer. Change-Id: Ida7ee77ecb450af05bfa66106caf2067b02f1a7f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | don't put QLibraryInfo and QSettings into bootstrap libOswald Buddenhagen2013-08-121-7/+1
| | | | | | | | | | | | | | | | it's not necessary. it was an artifact of a misguided approach to making qdoc aware of the qt installation dirs. Change-Id: I5ff363c8400d17698bf715e70b904aa69f71f0d8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | un-confuse lupdate: use #if 0 consistentlyOswald Buddenhagen2013-08-121-1/+3
| | | | | | | | | | | | | | | | | | it's no good idea to #if 0 the opening brace but comment out the closing one. Change-Id: I6f9ca8f14f0dc82fb22df85de547564336ed0476 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | un-confuse lupdate: remove excess brace in dead codeOswald Buddenhagen2013-08-121-1/+0
| | | | | | | | | | Change-Id: I7b81121b559f18446c4e546ad4f00cb4a592ca7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | un-confuse lupdate: make #ifdef'd braces symmetricalOswald Buddenhagen2013-08-121-3/+2
| | | | | | | | | | | | | | | | | | as a side effect, this also de-duplicates the code, which is good in its own right. Change-Id: I504cb518276fdf610639c3337e3842570b97815f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: John Layt <jlayt@kde.org>
* | Add auto-test for running the QEventLoop test with the GUI dispatcherTor Arne Vestbø2013-08-124-1/+9
| | | | | | | | | | | | | | Follows a similar include-pattern as the qguieventdispatcher test. Change-Id: Ie8669a5bc155abd6687e81526f2b95d0d19b009e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Don't assume Q_OS_UNIX means we support QEventLoop::X11ExcludeTimersTor Arne Vestbø2013-08-122-3/+19
| | | | | | | | | | | | | | | | | | | | | | A QCoreApplication may run a different event dispatcher, such as the QEventDispatcherBlackberry, and QGuiApplications will have the GUI dispatcher provided by the QPA plugin, such as QCocoaEventDispatcher. Neither support X11ExcludeTimers. Change-Id: Id5ea1c7dd74a127e13fa4d2eaa9a1bd2715a9dbb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Add some debugging information to diagnose bug.Stephen Kelly2013-08-121-2/+11
| | | | | | | | | | | | | | Task-number: QTBUG-32927 Change-Id: I7d0a1ad9eeb63ac0ec28483106f42109ed1a834c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Make QCoreWlan plugin compile on 10.9Gabriel de Dietrich2013-08-122-155/+989
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We take the path of least resistence and keep the old API code for 10.6 while updating the code for 10.7 and newer. This means we have some code duplication. It also means that we only compile the 10.6 code for QCoreWlanEngine when the deploymen target is 10.6. The 10.6 version file should be removed once we drop support for Snow Leopard. Change-Id: If4702b155bcdb7522800bf99a4dd37d4efed803a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Do not use QWindowsFileDialogHelper for Windows Server 2003Jonathan Liu2013-08-111-1/+1
| | | | | | | | | | | | | | | | | | Windows Server 2003 is based on Windows XP and should use QWindowsXpFileDialogHelper as it does not support the CLSID-based IFileDialog interfaces that are available from Windows Vista onwards. Change-Id: Idd973f9ec4c98d1f2fb7e835de64532edeccfc72 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | test: Mark tst_QFileSystemWatcher::watchFileAndItsDirectory() as XFAILSergio Ahumada2013-08-111-1/+6
| | | | | | | | | | | | | | | | | | This is a flaky test on Windows 8 64-bit, so marking it as XFAIL if it is expected to fail. Task-number: QTBUG-30943 Change-Id: Idd276f80b54fcd5cf295a7e1adebcf0020eaa8ca Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | test: Skip some flaky tests, but only if they are expected to failSergio Ahumada2013-08-101-33/+77
| | | | | | | | | | | | Task-number: QTBUG-29941 Change-Id: Ieca736c26711fa292855b3281229282628dce608 Reviewed-by: Richard J. Moore <rich@kde.org>
* | Remove OS X unsupported warning.Jake Petroules2013-08-101-4/+0
| | | | | | | | | | | | | | No other platform has such a warning and it really is not important. Change-Id: Ib85a536b6fcf9d7f15cd8b0779db7f6cfaec339a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Forward the correct compilers to the actual cmake tests.Stephen Kelly2013-08-091-0/+8
| | | | | | | | | | | | | | | | | | | | This was missing from commit 87db2fdef (Use the compilers used by Qt for the CMake tests., 2013-07-19) Task-number: QTQAINFRA-609 Change-Id: Ief1f0ed11d9f6268c636dc739fbf7945c5dee2c8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: a minimal qdocconf file with commentsNico Vertriest2013-08-091-0/+78
| | | | | | | | | | | | | | | | Task-number: QTBUG-31801 Change-Id: I3aa91c961ba5b3d4e7c69560673757120a850d42 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | test: Mark tst_QGlyphRun::drawMultiScriptText2() as XFAILSergio Ahumada2013-08-091-0/+4
| | | | | | | | | | | | | | | | | | This is a flaky test on OS X 10.8, so marking it as XFAIL if it is expected to fail. Task-number: QTBUG-32690 Change-Id: I0665c7474bb62c4c0a70e4b93cc977e3dbf1e150 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-08-0914-45/+179
|\ \
| * | Merge branch 'release' into stableSergio Ahumada2013-08-0914-45/+179
| |\| | | | | | | | | | Change-Id: I5e94c4f01564df633c9925561ebb0b553bd31a2e
| | * Doc: fix links to documentation in other modulesLeena Miettinen2013-08-081-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the depends variable with all modules as values, because the QT variable value documentation should list the import statements for all modules. This patch enables linking to other modules. Change-Id: I521ac22bac27d79537c14583f6592251288974a4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Don't release the printer after using it to change a propertyAndy Shaw2013-08-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The printer should not be released after changing a property on it as it is still needed by QPrinter elsewhere. It is released as appropriate automatically already. Task-number: QTBUG-32831 Change-Id: Idb2d98b25b62f343015a0a0fb3c9a0d506546132 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Android: Get SSL root certificates from TrustManagerPaul Olav Tvete2013-08-075-29/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android, when not using Ministro, we cannot read certificates from the file system, so we have to get them through Java APIs instead. Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit 591584d9a940d374e20a62573d71054e0081c6ac) Task-Number: QTBUG-32508 Change-Id: Ia157e28bc3b2c141e3444d628e7a7c59eca39db0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Enable qsrand() on builds without thread-safe posixEskil Abrahamsen Blomfeldt2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #ifdef clause in qsrand() needs to be the same as in qrand(). Otherwise, we will store the seed in thread-local storage in qsrand(), never passing it into srand(), and then we'll use regular rand() because the rand_r() function is missing, thus always using a random seed of 1 in all applications. Task-number: QTBUG-32781 Change-Id: I00240a1954ae746b87b031f3a0470a6cbe747571 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Doc: Corrected the example path in the tutorialVenu2013-08-021-16/+16
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32688 Change-Id: I12c264f29bc1d49322c60debdec3758859f62fa8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Fix handling of non-latin1 shortcutsGatis Paeglis2013-07-312-22/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables non-latin1 shortcut handling on Qt5/X11. Task-number: QTBUG-32274 Change-Id: Ia084258b956128ffade8eddfbcb18af334d79a59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: Add keywords for qmake variable/function reference pagesTopi Reinio2013-07-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Help mode in Qt Creator, many have accustomed to search e.g. for 'qmake variable reference' which no longer exists as a title in the qmake documentation. This change provides easier access to the qmake reference by creating keywords for them, making them appear in search results for searches starting with 'qmake'. Task-number: QTBUG-32268 Change-Id: If60a0cdc11464a8aeb50c62ddbde9683326e1384 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Windows: Clear window under mouse in destruction of platform window.Friedemann Kleint2013-07-304-1/+11
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32042 Change-Id: I8aa5df84b7ca6deb47e0c3eff9a6a7d2c4793553 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * QHttpMultiPart: fix data corruption in readData methodPeter Hartmann2013-07-292-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When readData() is called repeatedly, we need to keep track which part of the multipart message we are currently reading from. Hereby we also need to take the boundary size into account, and not only the size of the multipart; otherwise we would skip a not completely read part. This would then later lead to advancing the read pointer by negative indexes and data loss. Task-number: QTBUG-32534 Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * Doc: Re-highlight Tweet Search demoTopi Reinio2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt Quick demo Tweet Search works again, add it back as one of the highlighted examples. Task-number: QTBUG-31745 Change-Id: I4fc7d1a836159e9bb54fcd9e1a9c2760d97aa80a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Return EGLNativeWindowType instead of window number in winId()Alexey Chernov2013-08-092-5/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEglFSWindow::winId() method was changed to return EGLNativeWindowType EGL window handle instead of static window number as it recommends in documentation. QPlatformWindow documentation reads: "The platform specific window handle can be retrieved by the winId function." and also for winId() method itself: "Reimplement in subclasses to return a handle to the native window". Task-number: QTBUG-32564 Change-Id: I634c5b4d966b6aebde72518a2c39717d1b39af08 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Expect fail font family mismatch in the right placeFrederik Gladhorn2013-08-081-9/+9
| | | | | | | | | | | | | | | | This fixes 4ca4fb93f666820ab10fc0e17f54b2b777540779 where the fix was right, just in the wrong place. Change-Id: I3cde24624e3789870f1c16ccb92f78f7fc567fd5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Android: Fix QCoreApplication::applicationDirPath()Eskil Abrahamsen Blomfeldt2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Disable the code path which queries /proc/<pid>/exe for the current executable path, as from a Q_OS_ANDROID perspective, this executable will be the Dalvik binary. Instead we get the application directory via the fallback, by looking in argv[0], since this is set to the location of the application binary. Task-number: QTBUG-32852 Change-Id: Ib93050f41cbd47aaf71284e8bfa6a3247131d978 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Doc: preliminary review of qdoc-manual.qdocNico Vertriest2013-08-081-323/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | - syntax - grammar - writing guidelines - spelling - added contents for \\note Task-number: QTBUG-31801 Change-Id: I9df1af270acd7fbad39048a47b883f3002e168e4 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | [Mac] Fix modifier reporting issue in the key eventsGatis Paeglis2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | This issue was introduced when porting key handling code from Qt4 to Qt5. To conform to the implementation of QKeyEvent::modifiers() we have to invert modifier state logic before sending them as QKeyEvents. Task-number: QTBUG-31332 Change-Id: I3bb41169f8ab2a4b0a13a224bb461d2792d3a65f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Revert c3f485c5250a503832e767e1fe5e40595126f6c5Albert Astals Cid2013-08-084-134/+2
| | | | | | | | | | | | | | | | | | | | It has been discovered it changes the behavior of qdbuscpp2xml resulting in builds of some apps breaking. Even if the behavior is more correct, such behavior change in a stable branch is not acceptable Change-Id: I1d79104ebf11c3f48c84f109be2926af96cddae7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QComboBox: fix item activation via completerJ-P Nurmi2013-08-084-9/+65
| | | | | | | | | | | | | | | | Task-number: QTBUG-31146 Change-Id: I64291f397d80bf934152f63e629810540abf466e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Replace the Intel Haswell and Ivy Bridge codenames with actual namesThiago Macieira2013-08-081-8/+8
| | | | | | | | | | | | Change-Id: I2a31e96d324dd704e6f96b35ec68c79fd64a090e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | test: Mark tst_QSettings::ctor() and ↵Sergio Ahumada2013-08-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QSettings::rainersSyncBugOnMac(native) as XFAIL Mark some tests as expected failures on OS X 10.8 - tst_QSettings::ctor(native) - tst_QSettings::ctor(ini) - tst_QSettings::ctor(custom1) - tst_QSettings::ctor(custom2) - tst_QSettings::rainersSyncBugOnMac(native) Task-number: QTBUG-32655 Change-Id: I54928d991a8ccf300b40747feaa6fda9d124781b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Add offset reading support in pnghandlerSamuel Gaist2013-08-071-1/+17
| | | | | | | | | | | | | | | | | | This patch adds the offset reading that matches the offset writing in writeImage Task-number: QTBUG-32674 Change-Id: I264ba41163e59638d7219e0a8913f9d455830883 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Fix QCompleter::activated(QModelIndex)J-P Nurmi2013-08-072-0/+6
| | | | | | | | | | | | | | | | | | When falling back to the completion prefix, make sure to also pass an invalid index to activated(). Change-Id: I6b282a01c95492466890632b77837bcc96eb038a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Improve tst_QFileInfo::compare() test, but mark as QEXPECT_FAIL on MacTor Arne Vestbø2013-08-071-11/+6
| | | | | | | | | | | | | | | | | | As Qt still thinks that all UNIX filesystems are case sensitive, which is not the case for eg Mac, where they might be both, as well as for mounts of other filesystems. Change-Id: I07b8550685bfa17ac407c20ac991dc54df040942 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | qobject: Do not destroy slot objects inside a lockDario Freddi2013-08-072-15/+77
| | | | | | | | | | | | | | | | | | This prevents deadlocks in case the destructor re-enters. (Example: a functor containing a QSharedPointer of a QObject) This also fixes a leaked slot object in disconnectHelper. Change-Id: Ia939790e3b54e64067b99540974306b4808a77f2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Mac Style: Fix 1-pixel text offset in combo boxGabriel de Dietrich2013-08-071-0/+2
| | | | | | | | | | Change-Id: Ie1bb2b300d6897659f4652c22884f1bd611cd3c4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Don't crash if the QWindow's screen is temporarily invalidShawn Rutledge2013-08-071-0/+4
| | | | | | | | | | | | | | | | | | | | It can happen during the transition between screens when one screen is disconnected that the window doesn't have a screen. Task-number: QTBUG-32681 Change-Id: I066855a2ffe80f0680a3044e73f4f491c2c0eb5c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:05:18 +0000