summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QTreeView - emit collapsed in collapseAll()Thorbjørn Lund Martsum2013-01-312-2/+20
| | | | | | | | | | | When we call call collapase we emit collapsed. Therefore it should also be emitted on collapseAll() This partly solves: Task-number: QTBUG-8176 Change-Id: I20c1388fcbbb60d12debb4a0b3b0d9fed41e2563 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QTreeView - emit expanded on expandAllThorbjørn Lund Martsum2013-01-312-6/+25
| | | | | | | | | | | | When we call QTreeView::expand expanded is emitted. For the same reason we should emit expanded on expandAll() This partly solves: Task-number: QTBUG-8176 Change-Id: Ie85e724eec50980c68f626ec47dec5c1e08cc085 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* XCB: Free cursors.Friedemann Kleint2013-01-311-1/+7
| | | | | Change-Id: Id09046a3264724025e8a383cf40a959dafb9e0db Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QMacStyle: enable transient scrollbars for the desktop componentsJ-P Nurmi2013-01-311-8/+7
| | | | | Change-Id: I4f57a2c4eade779c594abaacaa872540b3b23cb1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Added support for multicore CPUs for INTEGRITY (V10+) target.Florian Behrens2013-01-301-0/+7
| | | | | | | QThread::idealThreadCount returns now the number of cores. Change-Id: Idc23fc3c257165f6a63c6a7686a57a4fe76f6413 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QColorDialog::DontUseNativeDialog usageJ-P Nurmi2013-01-301-4/+1
| | | | | | Task-number: QTBUG-29387 Change-Id: I97b3267981a0dcfdc95469cd0725b52ac4845346 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Update roleNames in QAbstractProxyModel if sourceModel resets.Nils Jeisecke2013-01-303-0/+53
| | | | | | | | | | | If a sourceModel resets, it's roleNames might have changed. This is most likely the case if sourceModel itself is also a proxy model of which the sourceModel was changed. Task-number: QTBUG-28982 Change-Id: I102788f2c9bf97b4002b350673f9219e32e7a052 Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Work around posix violation in qnx (missing pselect())Fabian Bumberger2013-01-303-10/+17
| | | | | | | | Change-Id: I7c1ae85ee7e92da3f394b488643613894977556e Reviewed-by: Peter Hartmann <phartmann@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Refactor QEglFSPandaHooks and add physicalScreenSize()Gunnar Sletta2013-01-305-69/+54
| | | | | Change-Id: I5a198af5347cc1fdce97031e0a1be99b2120c3ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix warning about incorrect format in tst_qlocale.Friedemann Kleint2013-01-301-3/+3
| | | | | | | type is unsigned long, should be %lu. Replace by stream. Change-Id: Ib0346b54a4494910b4a5927d0de45840ca53fbda Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Manual test for QColorDialogJ-P Nurmi2013-01-304-3/+280
| | | | | Change-Id: I4eab3ecfbe5b6e7d663fe92d49af173fd179ba6e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2013-01-304-0/+198
| | | | | | | | | This was part of Qt 4.8, but Qt 5.0 was branched before that, so the commit was lost. Change-Id: I2a2ab3c75a0943ac734d588ebd74bc158dd6aaaf Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Generate forward header (QtMath) for the math operations with syncqtLaszlo Papp2013-01-291-0/+4
| | | | | Change-Id: Ief5b5871a5d56bb606e09efcfd3a1422dcfbcd08 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Detect the Intel Compiler version on UnixThiago Macieira2013-01-291-0/+11
| | | | | | | | On Windows, it's completely different and we don't currently support that compiler anyway. Change-Id: Ie3365ea103c93c63e79ebb1d4908c361173ac449 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QStringRef: Added a trimmed() function.Keith Gardner2013-01-293-0/+55
| | | | | | | Change-Id: I67c5d10f29f420e0aea95cf32b5d3c17c141899c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Drop the unused qt_gl_convertToGLFormat functionGiuseppe D'Angelo2013-01-291-5/+0
| | | | | | Change-Id: Ie621f562401b703077a2b304ad6d8445efc76642 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Drop the unused QGLContextPrivate::convertToGLFormat functionGiuseppe D'Angelo2013-01-292-13/+0
| | | | | | Change-Id: Iaa176fc6152162c91a3e3bd373a235883001975c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-01-29107-446/+369
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-28107-446/+369
| |\ | | | | | | | | | Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
| | * Cocoa: Correct mime handler prioritization.Morten Johan Sørvig2013-01-281-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation recently added mime type converters should take precedence over previously added converters. Make it so. Task-number: QTBUG-25951 Change-Id: Ic23ca7cbb93a98711d762b1ef0e0dd2aa1ceaeda Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Don't use the union trick to do unlawful castsThiago Macieira2013-01-281-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 4.7 is printing this (bogus) warning: qobject.h:166:15: warning: 'QObject::findChildren(const QString&, Qt::FindChildOptions) const [with T = QMenuBar*; Qt::FindChildOptions = QFlags<Qt::FindChildOption>]::<anonymous union>' declared with greater visibility than the type of its field 'QObject::findChildren(const QString&, Qt::FindChildOptions) const [with T = QMenuBar*; Qt::FindChildOptions = QFlags<Qt::FindChildOption>]::<anonymous union>::typedList' [-Wattributes] Change-Id: I2d1c365e3191f3a5c7b2241deb35f0ae47d79afc Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Doc: Add a note for QDesktopServices about deprecated functionsTopi Reinio2013-01-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note in QDesktopServices class reference about storageLocation() and displayName() functions being deprecated since Qt 5. Task-number: QTBUG-27869 Change-Id: I739771fef15534823071beabd62aa7b4e7b34cc0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
| | * Doc: Widgets/Tools examples: fix group and missing imagesTopi Reinio2013-01-274-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Adds two images missing from Completer example documentation and fixes typos in \ingroup parameter. Change-Id: I2a9c1a22c65145dba37b182a82c19f4f0e424ca7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * consolidate generation of metafile install targetsMark Brand2013-01-254-36/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Metafiles such as .prl and .pc files contain paths that have to be adjusted during installation. The same code is used for unix and windows so move it into the base class. Change-Id: I82db89ec83820a4fa0214ba15e7cd63438f6dc91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * cocoa: Fix Mouse Event tracking of button statusRick Stockton2013-01-252-111/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Within qcocoahelpers, make function cocoaButton2QtButton() handle all button numbers. Within qnsview, call the function in several places (eliminating duplicate, inefficient code). Task-number: QTBUG-28567 Change-Id: Ibae2ae4e8a881b825a8862afb82aa80437751111 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
| | * Fix XCB plugin compilation without accessibilityOleg Shparber2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic2bee5b5c20505a866656575b5f5fb853cea4aae Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
| | * Doc: Fix module name formatSze Howe Koh2013-01-2582-208/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Minor QWindow documentation improvement for the accessor/mutatorsLaszlo Papp2013-01-251-6/+6
| | | | | | | | | | | | | | | Change-Id: I003e5dbf1e87fd98cb24c2efdfd39560326f2731 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Make QWindowsFontEngineData thread-local.Friedemann Kleint2013-01-252-8/+35
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29266 Change-Id: Id963187f1ef03caf4e9ed3c4397225a9ad7362bb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Fixed checking HOME variable return value using isEmpty()Pasi Petäjäjärvi2013-01-252-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return value of the QFile::decodeName(qgetenv("HOME")); is never null if HOME environment variable is not set. So need to check the return value using isEmpty() instead. Task-number: QTBUG-28912 Change-Id: Ic57b1978d63e99b056cde35ca8cb9d2a07ff8ce8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * qmake: Don't let an empty $$VERSION cause a garbled version in .rc filesDebao Zhang2013-01-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I7f0560979e645da216674cc70c73c5ea9c053aa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * configure.exe: Fix line feed characterDebao Zhang2013-01-251-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | config.summary has been opened in text mode, so the line feed character should be "\n" instead of "\r\n". Change-Id: Id73b0d698487cdd6f48902f3ae988c6a9fa59407 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * QPdfEnginePrivate: Fix invalid format for rectangles on some localesDmitry Shachnev2013-01-241-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by using locale-independent QByteArray::setNum() instead of qvsnprintf() for printing doubles. Task-number: QTBUG-24949 Change-Id: I68cb192417d9a94f72e039c40f647b4a6826a3b7 Reviewed-by: John Layt <jlayt@kde.org>
| | * Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"Joerg Bornemann2013-01-243-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e81d7fd1e57fe2ce11cbe07636f890973116f7ab. The insane logic that prepends the version number of a lib to TARGET_EXT instead of appending it to TARGET breaks every vcxproj with a library version. Fixing this properly will require much more work and testing on all supported Windows platforms. Forward-port of 8869b3b3 in qt/qt.git. Task-number: QTBUG-29286 Change-Id: Ib96de9c6f41995af013b146a00c850c9da3a9d8d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Stabilize tst_qabstractsliderFrederik Gladhorn2013-01-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When simulating hight load, this test failed 4 times out of 80 runs on my machine. With this patch I could no longer reproduce the failure. Change-Id: I42748de0200b9094c8facf0e33f3794002ec1d01 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * Use new path manipulation functions from qmake.Stephen Kelly2013-01-241-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | This is a less error-prone way to calculate relative paths. Task-number: QTBUG-29110 Change-Id: If4509ef278e48dcf08bdcc904d21534b4c05993f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Reduce invocations QString::left() in XCB key event processing.Friedemann Kleint2013-01-291-4/+5
| | | | | | | | | | | | | | | | | | Change-Id: I6d422af4d7186356c196d6362a850f7e7b997bb4 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Add the Qt::ItemNeverHasChildren flag and use it in QTreeView.Stephen Kelly2013-01-298-4/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | It can be used to determine whether expand() should really expand. Change-Id: If79d8c295a4ca1356e60051682b227524a065126 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | | Offscreen testing platform pluginSamuel Rødal2013-01-2915-3/+1384
| | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for running auto-tests without popping up a bunch of windows in the windowing system. Thus they can be run in the background and even in parallel without focus issues. Change-Id: I8b14c6de258b41225480a0af5a2a9553663bc2b7 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | | Do not execute tst_qfilesystemmodel in parallel.Friedemann Kleint2013-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It may interfere with other file system tests. Task-number: QTBUG-29014 Change-Id: I32dd7428993b0da1a2f70ec3e581050012a4ff32 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-29645-2503/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id2bb2e2cabde059305d4af5f12593344ba30f001 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | | Mention the new MEMBER attribute in the changelogOlivier Goffart2013-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Was added in commit 9bbebb914422262b7b585b6d1dab9d21c4238c44 Change-Id: I437dcb622197acd7afffb62711284a6168687063 Reviewed-by: Gerhard Gappmeier <gerhard.gappmeier@ascolab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Set some attributes on pthread condattrsThiago Macieira2013-01-283-14/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make them use the monotonic clock if that's available. On Mac, the monotonic clock is not available -- Qt fakes monotonic support by using the Mach timebase -- so we need to use gettimeofday. Change-Id: Iaea0b0c0de1b4802780e2476dc3643b703db392c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | QVarLengthArray: add squeeze functionPeter Kümmel2013-01-283-3/+46
| | | | | | | | | | | | | | | | | | | | | Add function to move back data to the stack. Change-Id: Ic78a368459bce68629e29602e4eeae2e1afe398b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix MinGW-Warnings in tst_qwinoverlappedionotifier.Friedemann Kleint2013-01-281-5/+8
| | | | | | | | | | | | | | | | | | | | | Change-Id: I66c4e274c8b686d8a69476ad10751008f256e5a2 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Fix warning about redefinition of _WIN32_WINNT.Friedemann Kleint2013-01-281-1/+0
| | | | | | | | | | | | | | | | | | | | | This is redefined by qt_windows.h Change-Id: I6a8cb06c93c4055b166f1a214cba981d61680b9c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | tst_qfilesystemmodel: Avoid commonly used folders.Friedemann Kleint2013-01-281-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the test's temporary directory instead of QDir::temp() and the documents folder instead of QDir::home(). Split out unrelated test from data-driven sort test. Task-number: QTBUG-29014 Change-Id: I229f0b1c0f1e43b56d19ebd43fd7cc64a85b1222 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Windows: Fix modal dialogs for declarative.Friedemann Kleint2013-01-282-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to show a modal dialog by just calling show(). Start an idle timer, which will start the dialog thread. This timer is stopped in exec(). Change-Id: I8f7352bf577b09a19be7df4484e0077bb1aa46ab Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Fix warning about redefinition of M_PI in tst_qwmatrix.Friedemann Kleint2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib5e5fe0f087448b07adfa02984524cbb10c78395 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | | Fix warning about unhandled enumeration values in tst_sqldriver.Friedemann Kleint2013-01-281-0/+2
|/ / | | | | | | | | | | Change-Id: I4e750982aab861abbbbabe980a663f8b118cdf54 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>