summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Switch to struct timespec everywhere instead of timevalThiago Macieira2013-01-2813-109/+109
| | | | | | | | | | | | | | | | | | | | | | | | This avoids an extra division by 1000 when getting the current time. This can't overflow, under normal circumstances, even on 32-bit: when adding two values less than 1 billion, the result is less than 2 billion, which is less than 2^31. Change-Id: I6f8e1aadfe2fcf6ac8da584eab4c1e61aee51cbb Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Don't emit activated on clicking disabled itemview item.Mitch Curtis2013-01-262-1/+26
| | | | | | | | | | | | | | | | | | | | | | A itemview item with its flags set to Qt::NoItemFlags is considered disabled, and therefore should not cause the activated signal to be emitted. Task-number: QTBUG-20490 Change-Id: If824505c46f4fcadb9265ad6d1e9337f0cee32cf Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | syncqt: Don't check for QT_{BEGIN,END}_HEADER macrosSergio Ahumada2013-01-262-21/+0
| | | | | | | | | | | | | | | | | | | | | | The QT_{BEGIN,END}_HEADER macros have never worked and might be potentially removed. Also removing the list of blacklisted files from sync.profile Change-Id: I601969cf8eddf3908c3ad46f63af9434670d4046 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix warning about type-punned pointersThiago Macieira2013-01-261-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The d->buffer array was 2x the required size and every other void* actually stored a DBINT (int) indicating the binding status of the null. The qIsNull function checked that value, but got the warning printed. Instead, let's just do the right thing and have a struct for each column. Solves the problem more neatly. Change-Id: I2daaf05c876da7e0e13fb983c58916d946518846 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Add toJson() formatting argument to QJsonDocument interfaceJean-Paul Delimat2013-01-263-43/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The writer delegate used by QJsonDocument to produce a Json QByteArray supports generating a human readable Json (with spaces and carriage returns that reflect the Json structure) and a less human readable (no spaces nor carriage returns) but more compact Json. The method toJson() was extended with a format argument to support the compact Json generation. Task-number: QTBUG-28815 Change-Id: I8d13849ab9ab6ed7c645011260251dc14a8629d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Debao Zhang <hello@debao.me>
* | Add static dotProduct methods to the QPoint(F) classesLaszlo Papp2013-01-265-0/+95
| | | | | | | | | | Change-Id: I66ac9433b74341a83569a60038ea2f7a025e81b1 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Establish an opacity property for the QWindowLaszlo Papp2013-01-262-3/+19
| | | | | | | | | | Change-Id: I1e399a41bc3aa890498d579f48d03cc6dee484bf Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix a typo and make the QQuaternion constructor documentation even more explicitLaszlo Papp2013-01-251-2/+3
| | | | | | | | | | Change-Id: I913ef98b706f29f1bab7564d6d6fff0a91ebfdc0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Introducing QWidget::createWindowContainer()Gunnar Sletta2013-01-2511-3/+712
| | | | | | | | | | | | | | | | | | | | A QWidget that can embed a QWindow. This can be used to embed a QWindow/QOpenGLContext based window or a full QQuickView. Change-Id: I8415b5ae38562fc00b46150fa70b56fd9b19a80c Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Improve QAccessibleApplicationFrederik Gladhorn2013-01-255-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | Add more testing. This uncovers that currently the QDesktopScreenWidget shows up as child of the app. Fixed by not creating QAccessibleInterfaces for QDesktopScreenWidget. Also don't crash in indexOfChild when called with 0. Change-Id: I9fb1e47e8f1f33189e6125f56f274a7b94ecd0dd Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | showIsFullscreen: only respect this hint for windows and dialogsRichard Moe Gustavsen2013-01-252-6/+9
| | | | | | | | | | | | | | | | | | | | If the window or widget is a popup, ignore the hint. The intention of the flag should be to show main windows etc in fullscreen, and not all kinds of popups and tooltips. The user can always call showFullscreen explicit when necessary. Change-Id: Ie150b6c6d7ca6c9344a9097544a7edbc4bd10df2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | QOpenGLTextureCache : make it possible to skip qgl_byteSwapImageElvis Lee2013-01-252-3/+7
| | | | | | | | | | | | | | | | | | | | Improving performance when making texture from QImage, this commit makes it possible to skip qgl_byteSwapImage. If gl_FragColor of fragment shader is properly configured, qgl_byteSwapImage is not required. Ex) gl_FragColor = texture2D(texture, textureCoord).bgra; Change-Id: If1f2d7dc1fc1c4e583cc3f38dec95a9d29417cd2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Doc: write up the docs for Q_GLOBAL_STATICThiago Macieira2013-01-243-13/+523
| | | | | | | | | | | | Change-Id: I5bf4d0d027dc8f960c94b4be3ebf7381e9ef4be1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Add an umbrella cmake config file for Qt 5.Stephen Kelly2013-01-246-3/+109
| | | | | | | | | | | | | | Change-Id: I96b6e96539a84a5919992afbaee757fa080b7ae0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Use path-based text when painter has negative scale on raster/coretextTor Arne Vestbø2013-01-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The CoreText font-engine is not able to produce glyphs with a negative scale (flipped). We need to report this fact back to the raster paint engine, so that it can fall back to painter-path based text drawing. For the GL engine this is not an issue, as the engine is able to handle the flipping itself, while still using a non-flipped glyph-cache. Task-number: QTBUG-29284 Change-Id: I3c24cee091786faae8a5c5dd756d208163330bfc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Don't assume m11/m22 represents the scale of a QTransformTor Arne Vestbø2013-01-242-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | We can still assume it when pulling out the scale of the glyph cache, since we limit it to scaling, but when computing the scale from the current matrix we have to decompose it. We always use a positive scale in the glyph-cache, and let the drawing code take care of any flipping of the coordinates. Change-Id: Ie3c4f2d91008a9be8f89bef29c15d80b23fb8a82 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-01-2427-40/+266
|\ \ | | | | | | | | | refs/staging/dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:43:32 +0000