summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix Q_DECLARE_METATYPE macroJędrzej Nowacki2014-03-172-2/+9
|/ / | | | | | | | | | | | | | | | | The macro should stringify value of the given token not the token itself. Task-number: QTBUG-37547 Change-Id: I90f4fa613bd13d5a581828ab13f620b40dfd3593 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Cocoa: Set "Stereo" OpenGL format option.Morten Johan Sørvig2014-03-171-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-35548 Change-Id: I60b633ae44b8b4b353a7328eb0922b9301e1460c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix high-dpi QGraphicsPixmapItem bounding rects.Morten Johan Sørvig2014-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsPixmapItem did not take the pixmaps devicePixelRatio into account when calculating the bounding rect. As a consequence, a 512x512@2x pixmap would get a 512x512 bounding size instead of the correct 256x256 bounding size. Task-number: QTBUG-37008 Change-Id: I266e418b7e5d92bf1d4c96bd9380a27708dc2b4a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | Fix rendering of grayscale antialiased FT fonts on QGLWidgetAllan Sandfeld Jensen2014-03-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | QFontEngineFT::alphaMapForGlyph and QFontEngineFT::alphaRGBMapForGlyph has been broken since change#65694. They always fall back to using the path rendering of QFontEngine because we zero the scoped pointer just before testing it. To fix it we need to release the scope pointer after we are done using it. Change-Id: I8811c1f5261f286f2f3dd3c0f93c988ba0909669 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Remove level 4 compiler warnings from MSVC.David Schulz2014-03-1510-8/+73
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7233 Change-Id: I52067e3a22e98a62fd87415906e54a54ff2d6b49 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Dave McClelland
* | QXcbWindow - inline the atom functionsMartin Klapetek2014-03-151-8/+5
| | | | | | | | | | Change-Id: I3a8f9efb7de21bf2301721edca49c9411c62eed0 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Update QScreen::availableGeometry() on _NET_WORKAREA atom changesMartin Klapetek2014-03-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the window manager sets new workarea using the _NET_WORKAREA xcb atom, QScreen::availableGeometry() does not react to that and returns an invalid available geometry. This patch reacts to that change and updates the QScreen property properly on xcb platform. Change-Id: I8f0b4a27bab0ce450fb7393f4d9a56f3ce9a4ea1 Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Cocoa: added queryKeyboardModifiers() in platform pluginLiang Qi2014-03-154-0/+12
| | | | | | | | | | | | Task-number: QTBUG-37181 Change-Id: I9256d0c9b83d6e5982864dc747586cbe2322b60c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Mac: Add support for high-dpi custom pixmap QCursorsKari Pihkala2014-03-151-2/+16
| | | | | | | | | | | | | | | | | | | | | | For pixmaps with devicePixelRatio greater than 1, create a native cursor that has a normal and a high-dpi representation. Task-number: QTBUG-34116 Change-Id: I1c014d65749add25f2b828837555a1844ede97c1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Cocoa: Disable the zoom button when appropriateMorten Johan Sørvig2014-03-152-0/+17
| | | | | | | | | | | | | | | | | | | | Disable the zoom (maximize) button for fixed-size windows and customized windows with the MaximizeButton flag not set. Task-number: QTBUG-37078 Change-Id: I6da88496474713de37b48aa65742203632ba99d6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Android: Delay the set of the BackingStore if window->handle() is null.BogDan Vatra2014-03-152-7/+17
| | | | | | | | | | | | | | Task-number: QTBUG-37458 Change-Id: Idddfe1876aff3d14d8c6c060d04236c5dc611bce Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Android: Fix another "QApplication not on main() thread" crashEskil Abrahamsen Blomfeldt2014-03-152-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The assets file engine is created before main() is called, thus prepopulate was called before main(). In this function, we created a QDataStream which internally created a QBuffer which inherits from QObject. This caused the main thread pointer to be initialized early, and the old "QApplication is not on the main() thread" warning and crash returned. The fix is to prepopulate the first time the file engine is used instead. Task-number: QTBUG-37444 Change-Id: I2c6e5f1a8ca88b5dc7d8e145fffeb7587dc0e623 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | iOS: update keyboard rectangle when scrolling the screenRichard Moe Gustavsen2014-03-151-8/+24
| | | | | | | | | | | | | | | | | | | | When we scroll, the keyboard will change position relative to QScreen, even if it appears to stay put. For that reason we also need to update the keyboard rect after doing a scroll. Change-Id: I9bda2ab5b5e4970f488d3e69e44cf58e273f8fcd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Windows native file dialog: Allow for omitting name filter description.Friedemann Kleint2014-03-151-2/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-37329 Change-Id: I644595a292e5b1890b2088b68be595bfcdba9d4d Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add verbose messages to tst_qnetworkreply.Friedemann Kleint2014-03-151-52/+70
| | | | | | | | | | | | | | Task-number: QTBUG-37449 Change-Id: Ib3802ddd51b908a68d8c893ce49010aeeb117db8 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Resurrect QGLWidget::renderText()Laszlo Agocs2014-03-156-15/+40
| | | | | | | | | | | | | | | | | | | | The variant taking x, y, z has been broken in all Qt 5.x releases. This is now corrected by making the GL2 paint engine capable of applying a Z translation. Task-number: QTBUG-31156 Change-Id: I119566e9e9577f6cdf7e8bae56cac1e34995e622 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Prevent DrawTextItemDevice::metric warning on MacMorten Johan Sørvig2014-03-151-0/+3
| | | | | | | | | | | | | | | | Implement PdmDevicePixelRatio. Task-number: QTBUG-36419 Change-Id: I4d2822d01e08c80e9b829d5f524e8e761e694fba Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix casting and overallocation in qregion.cppAllan Sandfeld Jensen2014-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The POINTBLOCK struct in qregion.cpp is badly defined. By using ints as the base storage of the internal array it forces not only bad casting from int to QPoint, but also allocates an array four times too big. This patch changes to char, since a char pointer may alias anything and this gives the right size of the array. Change-Id: I608eaf39ac7306c71314a139bed6e2352249c0ab Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Cocoa: Get rid of the forward window pointer asapGabriel de Dietrich2014-03-151-3/+5
| | | | | | | | | | | | | | | | | | | | As soon as we receive an event not related to dragging a QDockWidget out of its area (or a similar use case), we no longer need the forward window. Task-number: QTBUG-37265 Change-Id: I310e9cc2cf099c76e7a88427826d4b97ca0cd9b9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Remove the _qt_filedialog_xxx hooksJ-P Nurmi2014-03-152-138/+4
| | | | | | | | | | | | | | | | | | | | These internal and obsolete hooks are no longer used. The correct way to provide platform dialogs in Qt 5.x is to implement a platform theme plugin, as was done for GTK+ 2.x. Change-Id: I3f1474fbf760130106b3c47173eaedd2f1a919bf Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | Use QCommandLineParser in example dnslookup.Friedemann Kleint2014-03-154-56/+210
| | | | | | | | | | | | | | | | | | | | | | Show how use QCommandLineParser with additional parameter checking for custom options and positional arguments. Also explain how to display help in GUI applications. Change-Id: I03513e09b7dd5b150259593da0af2ef2a281cab2 Reviewed-by: David Faure <david.faure@kdab.com>
* | make property name doc match realityOswald Buddenhagen2014-03-151-1/+1
| | | | | | | | | | | | | | | | it's QT_INSTALL_CONFIGURATION, not QT_INSTALL_SETTINGS. probably the most useless of all properties, but anyway. Change-Id: Ia1e739ab4ed59e2bcd3199914caed2b3db9070ee Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Fix syntax/compiler error in QThread snippetLorenz Haas2014-03-151-2/+3
| | | | | | | | | | Change-Id: If64e01099b50f15b5cf7cdb0890dfa4f7625126d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Document %{if-category} in default message patternKai Koehne2014-03-151-1/+4
| | | | | | | | | | | | | | | | Commit 15ddb91b introduced %{if-category}, and changed the default message pattern. Adapt the documentation accordingly. Change-Id: I1d500122300c4d62171de3607553b3a5a822d4a7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Docs: Clarify QOpenGLFunctions::functions()Laszlo Agocs2014-03-151-0/+3
| | | | | | | | | | | | Change-Id: Ifb6fdc3de7f93a1632b396eaaa14078546cac4dd Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | HTTP internals: keep consistent state in channel and protocol handlerPeter Hartmann2014-03-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | It could be that the channel has its reply already reset to 0, while the protocol handler thinks the reply is still active, which might lead to weird behavior including hard to reproduce crashes. Task-number: QTBUG-37424 Change-Id: I89b65d34caaa546a343edc2ee205aa76425de88f Reviewed-by: Richard J. Moore <rich@kde.org>
* | Android: Turn off thumb for armv5 againEskil Abrahamsen Blomfeldt2014-03-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 4.8 compiler in the Android NDK sometimes produces uncompilable code for armv5. In change b4252802b3a537268b83855d2e13390bd5aedf5c we reintroduced thumb instructions on armv5 with a work-around for a particular case of this bug. However, the compiler now breaks for Qt Script. There's no time to try to find a work-around for this case, so we need to disable thumb again. It actually also seems that this is completely broken with this compiler, so it would probably be best to keep this disabled until the compiler is fixed. Especially since armv5 will become part of the CI builds now, so the compiler bug can end up blocking critical changes in the future if it's re-enabled :/ Task-number: QTBUG-37376 Change-Id: I9e1b050ce596717ba1fa7ec2f5e8a3ce3581a3af Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Fix a probably copy/paste issue from drawImage in the drawPixmap snippetLaszlo Papp2014-03-141-1/+1
| | | | | | | | | | | | Change-Id: Ia2b34e3ee6954342501a805f9e047cb90078e9d5 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | QWindowsXP/VistaStyle: Fix detection of item view delegate line edits.Friedemann Kleint2014-03-143-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | The old code tried to check the 2nd parent for inheritance from QAbstractItemView. This also triggers for line edits on a QDialog parented on the item view. Introduce convenience function that checks for top levels in the chain. Task-number: QTBUG-37504 Change-Id: I932f8efdb4764e9b1eea84c802bf7e8718338e1d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | WinRT: Add debug message handler for winrtrunnerAndrew Knight2014-03-141-0/+25
| | | | | | | | | | | | | | | | | | | | By placing debug messages in shared memory, the application can share debug messages with winrtrunner (or any utility which passes -qdevel to the app and opens the corresponding shared memory area). Task-number: QTBUG-37308 Change-Id: Id0e04cfd5f0f701d552a448f780788c7cbf9b438 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | iOS: fix build failure __IPHONE_NA not definedRichard Moe Gustavsen2014-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | __IPHONE_NA was previously defined to 9999, but with iPhoneOS7.1.sdk it is now undefined. From Availability.h: "__IPHONE_NA is not defined to a value but is uses as a token by macros to indicate that the API is unavailable" This causes Qt to evaluate QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE to true when given __IPHONE_NA as argument. And then the build will fail. Change-Id: I11f1d0285329d90c633c00c0c4d446ef5cd8089b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | d3dcompiler_qt: Remove control file semanticsAndrew Knight2014-03-142-41/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the compiler control semantics by always using the packaged compiler if it is available. With no packaged compiler, the service is assumed to be running if the directory structure is present. Use of a packaged library can be overridden by setting the environment variable QT_D3DCOMPILER_DISABLE_DLL to 1. When the runtime compiler is used, the source will no longer be logged, and the compilation output will no longer be cached. Change-Id: Ib07f517e7043d7785bdfa9da55abd34df518eeed Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Use Uniform Type Identifiers to detect OS X bundlesSamuel Gaist2014-03-141-30/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following Apple's documentation, the first step to identify a bundle is to check if it has a known extension. Currently, it's done using string comparisons ored in an if statement. The list is not complete and new types, whether provided by a system update or other means, can't be detected. The new approach is to use Uniform Type Identifier which queries the OS directly to check whether the extension conforms to kUTTypeBundle. That includes e.g. applications, frameworks etc. Task-number: QTBUG-31884 Change-Id: Ief73a83904adf27ccb71b0070e67cba081d1fd4a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Disable QtOpenGL in dynamicgl buildsLaszlo Agocs2014-03-141-1/+1
| | | | | | | | | | | | | | Migrating this is out of scope for the time being. Change-Id: Iac4a98d8db8e132a6ffa28075548fe2af76637fc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix dynamic opengl buildLaszlo Agocs2014-03-141-3/+5
| | | | | | | | | | | | | | | | Some ifdefs were slightly incorrect. Change-Id: I5ffb162becb040c91ed56f36c6126c59f67c367a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Fix one bogus print to stderr: use toLocal8Bit()Alejandro Exojo2014-03-141-1/+1
| | | | | | | | | | | | Change-Id: I86341ccbd0251a9c858a5e1a9b7ea291d73cda01 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Add AArch64 support to qfilesystemwatcher_inotify.cppDmitry Shachnev2014-03-141-0/+9
| | | | | | | | | | | | | | | | Based on a patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>, licensed under CC0 (aka Public Domain) or BSD license. Change-Id: I60815d6893c7a9d2873864ff626b865881ec5ee9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Introduce GENERATED_TESTDATA variable and fix qresourceengine test.Janne Anttila2014-03-142-8/+23
| | | | | | | | | | | | | | | | | | | | | | testcase.prf cannot be loaded from pro file for various reasons, see qtbase commit history for details. Moved runtime testdata logic from pro file to testdata.prf, and thus made is reusable in other test cases as well. Change-Id: I500d08dc4951e4eda862071e4ddd3e0f6de8c3d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QNX: Fix touch positionFabian Bumberger2014-03-141-1/+1
| | | | | | | | | | | | Change-Id: I8e4f83f58fbb31f7cffdf74b0ce431a6fd46f13b Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | BlackBerry: Add button color to dark paletteBernd Weimer2014-03-141-2/+4
| | | | | | | | | | Change-Id: I35191841e4d606042375ab8af442a339d6a701dd Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Android: Use proper empty strings in key eventsPaul Olav Tvete2014-03-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | A key event with no unicode would get a text of "\0" instead of the empty string. This would lead to various widgets interpreting the Key_Back event as text input, meaning that it would be grabbed by the widget instead of being propagated. Task-number: QTBUG-35784 Change-Id: Ibdb0e491572e41dd1aaf3b03ae1a780731f0559a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Handle key release events correctlyPaul Olav Tvete2014-03-141-0/+2
| | | | | | | | | | | | | | | | Properly ignore key events that we don't actually handle. Task-number: QTBUG-35784 Change-Id: Ibd3e72c76367a1dc3b1f2d39538fcf8441082ff2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Don't block Key_Back in file dialogPaul Olav Tvete2014-03-142-7/+2
| | | | | | | | | | | | | | | | | | | | Update the 10 year old FIXME hack to allow Key_Back (which will close the dialog on Android). Also clean up nearby code that has been dead for seven years. Task-number: QTBUG-35784 Change-Id: I609858afb2caefe7025e421406288ae56717fea5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | properly replace windows paths in installed plugin prl filesOswald Buddenhagen2014-03-141-0/+1
| | | | | | | | | | | | | | | | amends 53f48a4b. Task-number: QTBUG-37399 Change-Id: I599ba612af760891cd99283560ccc9240125db39 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | enable path replacement in installed plugin prl files on all platformsOswald Buddenhagen2014-03-141-9/+7
| | | | | | | | | | | | | | | | amends 08a2d8df4. Task-number: QTBUG-37399 Change-Id: I113ddf632d2ce3f7f2c92e079fd2fa3a1a640c1a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add GL information to qpainfo.Friedemann Kleint2014-03-141-0/+72
| | | | | | | | | | | | | | Task-number: QTBUG-31611 Change-Id: Ibf9bcb74ed8dbf8625e77ef0870d758a77ea65cb Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | iOS: Create folder for SUBDIR projectsMarkus Goetz2014-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | In case of a SUBDIR qmake project, it tried to cd into a directory that did not exist yet. I needed to run qmake twice to get it working. This fixes it. Change-Id: I6d322e9a7c96a9d82df77b9ba5f19711a8180ed0 Task-number: QTBUG-37429 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Fix spurious XPASS in tst_QGraphicsAnchorLayout.Friedemann Kleint2014-03-141-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seen on Windows: XPASS : tst_QGraphicsAnchorLayout::stability() QCOMPARE(sameAsPreviousArrangement, true) returned TRUE unexpectedly. tst_qgraphicsanchorlayout.cpp(1399) : failure location Move check into loop with descriptive message on fail, do not error out if it actually passes. This now typically prints: XFAIL : tst_QGraphicsAnchorLayout::stability() The layout has several solutions, but which solution it picks is not stable ( QRectF(30,0 0x10) != QRectF(30,0 10x10) , iteration 3 , item 4 ) Change-Id: Iae8553dbbcedeb70d5d672e3cefbd1f06a63d27d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Add workaround for bug in the Mesa glsl optimizerJorgen Lind2014-03-141-10/+4
| | | | | | | | | | Change-Id: I23251f5288b41f5b7f86406984fdd854127797a9 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Vista Style: More menu item pixel fixes for QtQuick ControlsGabriel de Dietrich2014-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | Includes a one-pixel fix for widgets, where the menu item text would be one pixel too far away from the vertical gutter. Task-number: QTBUG-37451 Change-Id: I2539233814a427c5bed66a5c07584717eb3df418 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 17:45:57 +0000