swh:1:snp:673156c31a876c5b99b2fe3e89615529de9a3c44

sort by:
Revision Author Date Message Commit Date
a3f7483 raspberry pi: add /opt/vc/include/interface/vmcs_host/linux to GL includes This matches upstream changes on https://github.com/raspberrypi/firmware/ Change-Id: Ie28c2fa574d5cd097c033926970db40e8904e42e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> 27 March 2013, 07:36:10 UTC
12d8432 Fix infinit loop Change-Id: Ie1edfeae72e033b14e16cc4c5c9e388f11be1627 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> 27 March 2013, 07:11:57 UTC
1fb3d56 QtWidgets tests: Don't use the deprecated QTest::qWaitForWindowShown() Change-Id: I2dd5a54f9485591ca2dab65f7a352ef453c185e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 05:01:11 UTC
90d74f8 QtWidgets tests: Don't call the empty function QApplication::syncX() Change-Id: I2c732afd43586209cf5a2b72caac53e34abb9090 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 05:01:11 UTC
f57a3c0 tst_qgraphicseffectsource: Don't use the deprecated QGraphicsItem::children() Change-Id: I0cc0c5284a675fb1c7f960e9790baa89c56112b1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 05:01:11 UTC
bca0ee7 QtXml tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: Ifb9363fb6d397a91501fc906454e172731d4c06d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 02:54:48 UTC
dd4220b QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: I48c83fa0c5eccd86a5242fc8ed51ac6d7623f7f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 02:54:42 UTC
670aae7 QtConcurrent tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: Ia0c4751b891ae81a66b072bc504b555d81625172 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 02:54:25 UTC
495f7ca QtTest tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: Id67ab0ea3be47d3b365aa01a354829b8745b7250 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 27 March 2013, 02:54:20 UTC
925fd32 qmake/Win: disable "find highest lib version" feature by default The undocumented feature of linking the library with the highest version number is more confusing than helpful. We're changing the default from on to off now. Users who still need this feature can turn it on with: CONFIG += link_highest_lib_version Task-number: QTBUG-15596 Change-Id: Ic998c1685003caa6f57e27dccf83c8b4a2a09553 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 26 March 2013, 20:44:15 UTC
d616915 Support high-dpi images. When Qt::AA_UseHighDPIImages is set images and pixmaps may be of the high-dpi type. Account for this when calculating layout sizes by clamping the size or dividing by devicePixelRatio() to go from device pixels to device-independent pixels. Change-Id: I7b7f4c36ebd83d72ecdf6fbe0ae20e20ed6540bb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 26 March 2013, 20:44:15 UTC
491dcbf Cocoa: Make retina desktop components work. Scale non-widget paint devices as well. Change-Id: Ic68fb166058e9b162f8baeab81196ee254f30b2e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 26 March 2013, 20:44:15 UTC
87b3aa9 Revert "eglfs: Disable eglfs when evdev is not present" evdev support in eglfs is now guarded by QT_NO_EVDEV, so this check is no longer required. This allows eglfs + tslib to be a supported combination. This reverts commit a95e396a83930de14c6964dbf3724d6162d8400b. Change-Id: Icf7c15121b7eca1131d412b05b956cd5d7f189ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 26 March 2013, 20:44:15 UTC
bb4e2e4 Allow tslib to be specified at configure time. Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 26 March 2013, 20:44:15 UTC
bafd3fd Make the inline CPU detection functions also static Since qCpuHasFeature() checks the static qCompilerCpuFeatures variable and that variable's value might change depending on the compiler flags, it's best to ensure that the function is not subject to link-time merging. That would be bad if it happened when qCpuHasFeature() was used from a file with higher CPU compiler settings than the default, as it would incorrectly conclude that certain features are always available. Change-Id: I8bacde056fb89869ec1d306a163742e72522315e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> 26 March 2013, 20:44:15 UTC
03d057f Cocoa: Make touch events work again. Bring back the ref-counted enable on enter/leave workaround we had in Qt 4: If any widget in a window sets WA_AcceptTouchEvents then that window will start processing touch events. Enabling touch events has implications for delivery of other events, for example by causing scrolling event lag. Change-Id: I307488937f417612eff624bf9892b82a7f69c1b7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 26 March 2013, 18:22:01 UTC
b2c73c7 Cocoa: Correct enter/leave event handling. Make top-level windows generate enter/leave events for sub-windows. Keep track of the current "under mouse" window in mouseMoved and send EnterLeave events when it changes. mouseEntered/mouseExited handles enters and leaves from the top-level window. Add tests/manual/cocoa/nativewidgets. Task-number: QTBUG-27550 Task-number: QTBUG-29751 Change-Id: If4b9f9e0f39d9fb05fdab45a100ffdcf107965ad Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 26 March 2013, 18:21:38 UTC
a2fc370 Fix font stretching issue We're treating fontDef.pixelSize as a box height everywhere but in harfbuzzFont initialization code the logic was opposite. Change-Id: I4eecf7861a6084c7f2dbe1df85a71f2e251da845 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> 26 March 2013, 18:14:16 UTC
f1d8987 Fix a bug in QSystemLocale on BB10 Call qt_safe_open in the constructor to avoid opening the pps files several times. Change-Id: I1bf79284850353a47ee1fc17797cd667536e17b1 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> 26 March 2013, 17:58:29 UTC
6131f79 QNX: Code cleanup: normalize 'if' macro usage Always use "if defined" instead of "ifdef". The same is valid for "ifndef" macros Change-Id: I8e8f65e36dc636c10b3d656ce9a89ab3a664a80b Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> 26 March 2013, 17:55:11 UTC
17159b4 QLocaleBlackberry - fix include statements Change-Id: Ifb5678094806e4aab19015d3a600217b4cf9ac5f Reviewed-by: David Faure <david.faure@kdab.com> 26 March 2013, 17:54:42 UTC
7810ba1 Fix documentation of QFileSystemModel::resolveSymlinks(). It's Windows only, and it defaults to true. Change-Id: I82badbcae0fdba589b57a7dfe627b99ec6cc92c5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 26 March 2013, 17:33:30 UTC
244cc5d FontConfig: Correctly report Symbol writing system support When all the Q_WS_X11 were removed, we also removed the special case for symbol fonts in QFontDatabase for FontConfig. This was checkSymbolFont() in Qt 4, and this patch copies the code and adapts it to Qt 5. Task-number: QTBUG-30044 Change-Id: I346f208052013eae9de3c33c210bf5db1d2aef87 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> 26 March 2013, 17:04:50 UTC
46f3543 Fix handling of 0x00AD code with symbol fonts (Win/QPA/QPF/fallback) ...by updating HB_Face::isSymbolFont value to make HB know that the font is a symbol font. U+00AD is a Unicode soft hyphen character, which shouldn't be threated like a default ignorable (invisible) when 0x00AD occurred in a symbol font. Change-Id: Idd4760aded644f7f11a1a8d3c03c348abc69a3e4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> 26 March 2013, 17:04:11 UTC
ea1b1ef Revert "Don't duplicate the 'top-level' include dir in all modules." This will likely fix some odd cmake related tests in the CI. This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef. Conflicts: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in src/corelib/Qt5CoreConfigExtras.cmake.in Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00 Reviewed-by: David Faure (KDE) <faure@kde.org> 26 March 2013, 12:07:14 UTC
7fb3c6b Fix the CMake tests with CMake release candidates. The version number parsing needs to handle the reported version string. Change-Id: Ifd34b2c86b21a1c5e4c91a43447468ca6feab8cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> 26 March 2013, 12:07:08 UTC
be431cc Get more information from failing cmake tests. Enable verbose makefile output which will appear in failure logs. Change-Id: I005069c122f46887f6095034d9cf1a3d2fdbc750 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 26 March 2013, 09:18:02 UTC
b96e8ff QNetworkInterface auto test: do not abort without session ... but only if the QNetworkConfiguration manager requires one. Change-Id: I1c69c43438f1df9080d207c8598a42201f759c5b Reviewed-by: Shane Kearns <shane.kearns@accenture.com> 26 March 2013, 09:18:02 UTC
d0ad02a tst_qtreeview: Use QRect::intersected instead of QRect::intersect Change-Id: I4579929473a408b73f3ad9014ea30ce5a602259c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> 26 March 2013, 09:18:02 UTC
f8bf008 Document undefined behavior regarding Qt::ItemNeverHasChildren. Change-Id: I4c044b206ad6dd57f11d791d8a6a6f3f931acf4f Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> 26 March 2013, 09:18:02 UTC
771a254 qdoc: Show signals inherited from abstract base types qdoc was not including QML signals in the documentation for a QML type, when the signals were inherited from a QML type that had been marked abstract. This is now fixed. Additionally, the QML type qualifier is not shown in the header for the documentation for a member of a QML type. The type qualifier was redundant information, and it was incorrect for members inherited from abstract base types. Task-number: QTBUG-30111 Change-Id: I73aef40f69a15bca6948bf36596b83800d248b1f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 26 March 2013, 09:18:02 UTC
e90ce86 Fixed shortcuts for some (e.g. Russian) layouts If CMD modificator is active [nsevent characters] is used now to get keyCode. In this case for example English "X" is returned instead of Russian "Ч" even if Russian input source is selected. Task-number: QTBUG-30306 Change-Id: I93cd292633e68327df0c580ed74fe8ad1c9ed27d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> 26 March 2013, 06:31:12 UTC
badbb6f Make QGraphicsScene::touchEventhandler ignore unhandled touch events This was not done in Qt 4 to play well with the QGesture implementation, and may need to be revisited if/when we bring back QGesture for Qt 5. Change-Id: I4f5f6c8a67387039e838d1ef42ecc70c455ed8a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 26 March 2013, 06:28:24 UTC
c532395 Set screen position when generating synthetic mouse events from touch QGraphicsView uses QMouseEvent::globalPos(), so we need to set it when synthesizing mouse events in QApplication. Change-Id: I8341e09fdd41400c5c5e1d0ee17c7323efdafaeb Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 26 March 2013, 06:27:26 UTC
470f921 Silence warning by Apple Clang 4.2 about adding an integer to a string It gives a good suggestion on what to do and even shows us how to do it. doc.cpp:2681:34: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int] result += " " + (column % tabSize); ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ doc.cpp:2681:34: note: use array indexing to silence this warning result += " " + (column % tabSize); ^ & [ ] Change-Id: Idd2157ab04cd2a3e37a1336bb5e8926ddc14823a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> 26 March 2013, 04:06:17 UTC
fff8b69 Introduce QMAKE_CC_O_FLAG This makes it possible to properly parametrize alternative compilers. Change-Id: Iaf0961c47875ee16d815356f36acf5652577cdca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 25 March 2013, 22:11:22 UTC
a3c802e Make sure that we check that pkg-config knows sqlite3 before using it Otherwise, we end up with an empty QT_LFLAGS_SQLITE and the plugin won't link. Change-Id: I026f60bf9cd075218dbe2888fbb7fc82782b27ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 25 March 2013, 22:11:22 UTC
ffe45f1 QNonContiguousByteDevice: roll back complete internal state in reset() ... otherwise we would not start reading from the beginning when the device was reset. Change-Id: Ida196eb40790fba56ff2eed782fd93a3015222f9 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> 25 March 2013, 19:50:26 UTC
83c9d22 Remove dependency on QPlatformSupport in fontdatabase test If you include a static library in the test, all symbols will be duplicated, and this can cause nasty crashes because global static data is also duplicated. This happened on Linux because of a global static cache in the font engine where the two instances of it would get out of sync, and we would reference invalid data. To test QPlatformSupport features, a QPlatformSupport test which does not load any platform plugin (or uses its own platform plugin which does not load QPlatformSupport) is needed. For now, I will just revert adding the test, since it is broken and was added as part of supporting Windows CE: f2fabf77f9bc18448aed0e99a6d7d1d6c5c9c736. Change-Id: I6c002d1e0880ee8e031a68eee80e781fe0c62af4 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> 25 March 2013, 18:21:40 UTC
23051ff Clean up touch window registration. Stop processing for Qt::Desktop windows (which caused RegisterTouchWindow() to fail with access denied) and set a flag to cleanly unregister. Change-Id: I3d10c93ec92536d3ab1c0503f088c40b0c08a01f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> 25 March 2013, 09:42:01 UTC
a6e5ccb QMdi: Don't emit subWindowActivated during StyleChange handling. The handling of StyleChange de-maximizes the child window temporarily, which was emitting subWindowActivated. This would crash lokalize, because deactivating a window means deleting the widgets associated with it, and style-change handling is done in QApplication by looping over QApplication::allWidgets, which would then contain dangling pointers. Full valgrind log at https://bugs.kde.org/show_bug.cgi?id=271494#c7 Change-Id: Ifb24032cde2cd470dcae7cd553ec5ab45a919dd6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> 25 March 2013, 09:37:37 UTC
5c6b2ed OSX: WindowTransparentForInput QNSView pass events to next responder The default implementation (in the super class) passes the event to the next responder. This seems to be one valid way to handle the Qt::WindowTransparentForInput flag. So if a non-alien widget for which a native NSView is created has the flag WA_TransparentForMouseEvents, that means the window will have Qt::WindowTransparentForInput, and the NSView which is created on its behalf will pass on each event so that other NSViews have a chance to handle it. (It will also try to reject becoming first responder, but that doesn't seem to be enough for the following events to be passed on.) This is a followup to I979be9f72f7d225d7b960fc5db4c3956d2749982 which purported to obey the WindowTransparentForInput flag, but actually doesn't. Change-Id: Ia72a3573c2e3cbfa7ede70bee41ac36df6924598 Task-number: QTBUG-28816 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 24 March 2013, 17:00:44 UTC
795468b QHttpMultipart: reset read pointer when device is reset ... otherwise we would not read from the beginning when trying to read again. The device is reset when we try to resend a request (e.g. remote host closed etc.). Change-Id: I21d3647dd0e00ae8bc2507f08166234f21f88861 Reviewed-by: Markus Goetz <markus@woboq.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> 24 March 2013, 12:56:32 UTC
804a067 QNonContiguousByteDevice: reset() instead of seek() if possible ... because e.g. QHttpMultiPartIODevice does not implement seek at all (QTBUG-30295), which would make resetting such a device fail. Change-Id: I0a9c0f21047baa72146690bfdf638cdffab0e25f Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> 24 March 2013, 12:55:58 UTC
7b5ad88 Guard usage of [NSApp setDockMenu]. setDockMenu is not documented an may disappear. Closest documented replacement seems to be [NSApplicationDelegate applicationDockMenu:]. It can't be used as a direct replacement since it's a "virtual" getter that the application delegate implements. Change-Id: Id161196018057b75cbe7d6f6d2610c0932345c5f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 24 March 2013, 02:42:49 UTC
5ad615a Use [NSSavePanel directoryUrl]. [NSSavePanel directory] is deprecated. Change-Id: I3515b565a25028dc5b7c966481707e001e44a077 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 24 March 2013, 02:41:45 UTC
73d4fc6 Call [m_qtView hasMask] hasMask is a function on QNSView, m_contentView can be any NSView subclass. Change-Id: I88b5acbb8aad9aa4664e0f71f37add9dfa64f1b7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 24 March 2013, 02:41:13 UTC
4a1116a Remove unused variables in the Cocoa plugin Change-Id: I7cdd369e2fbab02954da6ba3c05b31d93f1e7995 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 24 March 2013, 02:40:20 UTC
fa62b6c match #ifdefs relating to arm compilation use the same conditional around the #include as the actual code below uses, otherwise we risk mismatches. Change-Id: I8ca32c0178b1970928626a927948b06d4c6d31b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 24 March 2013, 02:24:52 UTC
f226e7e Doc: Added the Q_REVISION macro to the ignore list This should avoid QDoc warnings when the macro is used with the signals and slots. Task-number QTBUG-30105 Change-Id: I8d1b32854c15ff07e6ece7b326be38666ae29c3f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> 24 March 2013, 02:21:09 UTC
206e8f6 Fix access to interface in QAccessibleEvent Sometimes we get an invalid interface. In that case the event should just return 0. This avoids some potential crashes. Change-Id: I9f166b5d5547dbe7f22c4756502aee811b0b80a6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 23 March 2013, 15:47:28 UTC
f217172 qWaitForWindow* default timeouts are 5 seconds A widget window can be expected to show up faster, but on a busy CI machine, OpenGL windows can take longer than 1 second. Change-Id: I572cc86bf4d8beebcc565db8d6f2ff78e55c2ac0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> 23 March 2013, 15:47:28 UTC
52cd53a Fusion Style: draw toolbar lines for non-widget apps. Change-Id: If9415cfc05f80ba4e67d9ba6a8ebb1caaa738b84 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> 23 March 2013, 13:42:45 UTC
5147b1d Accessibility: Fix crash when updating in dtor This happens for example when running several tests. Widgets in destructor should be treated as invalid since their window pointer and other properties are no longer valid. When deleting a window containing only a table view there would be a table model reset update comming from the window being destroyed. Change-Id: Ia387c814333ce373fe132b189fc180787e36cdd5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 23 March 2013, 13:42:45 UTC
a330448 Ensure QTemporaryFile can create files when an identical dir exists. When QTemporaryFile attempts to create a new file in createFileFromTemplate, it fails if the filename exists and is a directory. Windows returns error code 5 (ERROR_ACCESS_DENIED) in this case - rather than ERROR_FILE_EXISTS - which is not handled. This patch handles ERROR_ACCESS_DENIED in addition to the already handled ERROR_FILE_EXISTS, meaning that QTemporaryFile will continue to look for unique names when a directory with the same name exists. Task-number: QTBUG-30058 Change-Id: I42339887d7f5483e3dc6a03a9da15111c350da8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 23 March 2013, 13:42:45 UTC
0450d81 Fix leak when fd != -1 Change-Id: I07bcf4b678460c86642436d1a69071f765ef63ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 23 March 2013, 13:42:45 UTC
fe52d18 Accessibility: Fix crash in windowHelper When accessing the parent, we cannot be sure that the parent interfaces are all valid. Invalid parents can happen during destruction. Another cause is unusual hierarchies, the QAbstractItemView::columnDelegate test triggers a situation where this used to crash. In addition to the actual problem, add checks for every parent() call. Change-Id: I70b2bf7bc3c02b0f33e22b81023fd24519adeba9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 23 March 2013, 10:48:33 UTC
6d9541a Do not update accessibility for invalid interfaces Change-Id: I8dc29ea51393406e529c76f25bf2f8cf426e26cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 23 March 2013, 10:43:39 UTC
6ec9b34 Make QIcon generate high-dpi pixmaps. QIcon::pixmap() can now return pixmaps that are larger than the requested size, This is a behavior change that may require updating existing application code, and is enabled by setting Qt::AA_UseHighDPIIamges. Add new pixmap() and actualSize() overloads that take a window pointer. For 100% correctness you want to target pixmap generation to a specific window, in case the system has a mix of normal and high-dpi displays. (The non-window versions uses QGuiApplication:: devicePixelRatio(), which returns the ratio for the "best" display on the system.) actualSize now returns the size in device-independent pixels - not the pixmap pixel size. This matches its intended use case which is layout calculations. Change-Id: I2eefc4ed4aa48b036a7019446694e56213070efa Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 23 March 2013, 07:32:17 UTC
7067c32 Suppress warning about xkbcommon unless we're building XCB I don't need that warning on my Mac. Change-Id: I18c06135ba88a037103fdda0982976f4a87c553e Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 23 March 2013, 03:33:11 UTC
93acff7 Add support for the Clang compiler bundled with XCode Since c45595d64831990311f92fcebc4e34e2797f5352, we use the toolchain based on the XCode SDK, not the one in $PATH. Turns out that the Clang that comes bundled with XCode 4.6 reports its version as Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn) Instead of "Apple clang". So we need to match for (clang|LLVM). Extended regular expressions (with -E) were necessary because the sed that comes with Mac OS X is apparently broken and will not work with \(clang\|LLVM\). GNU sed accepts -E as an alias for -r, meaning extended regexps. Change-Id: I5a15de30721216b086c3d39a080cc6496c503985 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> 23 March 2013, 03:33:11 UTC
d4adee7 Fix race condition in QThread::setPriority The value of priority was read without the mutex locked, from within the thread. Had to extract a QThreadPrivate::setPriority method so that it can be called with the mutex already locked. So if the main thread calls setPriority while the thread is starting, it will be either be before or after the "re-set priority" code at thread startup, but at least not in the middle of it. Change-Id: I7a054f68623f61482c749274da66f3b2dcd8bcee Reviewed-by: Olivier Goffart <ogoffart@woboq.com> 23 March 2013, 01:06:47 UTC
c550a5d Remove unused private members These members are in private classe, so we can safely remove them. qpathclipper.cpp:762:9: error: private field 'm_point' is not used [-Werror,-Wunused-private-field] qsimpledrag_p.h:100:20: error: private field 'm_cursor_drop_action' is not used etc. Change-Id: I35ed486eb959c49bb971700500a66411308ee7bc Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> 23 March 2013, 00:56:06 UTC
336eac0 Remove unused private fields in a class used for anti-flicker workaround qwizard.cpp:510:14: error: private field 'wizard' is not used [-Werror,-Wunused-private-field] qwizard.cpp:511:21: error: private field 'wizardPrivate' is not used [-Werror,-Wunused-private-field] Field "wizard" was really unused, in all platforms, so simply remove it. The field "wizardPrivate" is used when the Windows Vista style is enabled. Change-Id: I1ce254f484b613655bff7f6c3ee8e04479960d7c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 23 March 2013, 00:56:00 UTC
caffabc Mark Q_UNUSED the private members that aren't used Apple Clang 4.2 has a new warning, letting you know when a private member isn't used by any member function (and, I guess, if the class has no friends): private field 'd' is not used [-Werror,-Wunused-private-field] Qt has a few of those for future expansion. It's not an error for us. Change-Id: Id2edb1159589572f97a07f93181c9c96c5dd983c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: David Faure <david.faure@kdab.com> 23 March 2013, 00:55:58 UTC
1622dca Fix whitespace issues in *.prf Replaced tabs with spaces to align with space-indented code and removed some trailing whitespace. Change-Id: I4930afc3df206ef8ee96de3e69f0d69fc4a1c77c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 22 March 2013, 18:52:26 UTC
0c645f1 Inform android input method when cursor is moved Google Japanese Input Beta keeps track of the cursor position, and bails out if the cursor is not where it thinks it should be. We have to tell the IM every time we move the cursor, not only when we are composing. Change-Id: I9cdb28f81c76e76d3b0125d08bf0595616ca443f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> 22 March 2013, 18:52:26 UTC
1f180e9 SSL code: store SSL parameters for debugging, guarded by define ... so SSL traffic can be decrypted with e.g. tcpdump / Wireshark. For this to work, the define needs to be uncommented and QtNetwork recompiled. This will create a file in /tmp/qt-ssl-keys which can be fed into Wireshark. A recent version of Wireshark is needed for this to work. Change-Id: I4e41fd2e6122260cd96d443b1360edc71b08b5fd Reviewed-by: Richard J. Moore <rich@kde.org> 22 March 2013, 18:52:26 UTC
ab18bb8 Remove QtWidgets dependency from Android platform plugin The setFullScreen() function was never called from anywhere, so it was just removed. The update() loop for top level widgets has been replaced by a loop sending expose events to top level windows. Task-number: QTBUG-29313 Change-Id: Ic31a05ad3a0693f1d3f61457cee9d78f6b334b4d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> 22 March 2013, 18:52:26 UTC
e855240 Use qtproject instead of necessitas for default package name Task-number: QTCREATORBUG-8779 Change-Id: Idf62e5efa4b8bc4b90d99b3883ae127a0cc7e92c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> 22 March 2013, 18:52:26 UTC
9181ee4 Fix missing parts of Ie511522d35b5658c20be43dd112eae18c205277f in merge The merge of dev->stable branch somehow lost these bits of: Make QCoreApplication::startingUp() return false when appropriate. Which was Change-Id: Ie511522d35b5658c20be43dd112eae18c205277f Change-Id: I2991b10e2774bf5a59fa37734d4a9fd39d51b472 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> 22 March 2013, 18:52:26 UTC
37842c2 Compile most manual tests with Qt 4. Replace <QtWidgets> includes by class includes, remove tests that do not compile. Change-Id: I52837e8c567dc8ac365c7d43c37beb9a368f6f72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> 22 March 2013, 18:52:26 UTC
4e07286 Only instantiate QAccessibleWidget after trying inherited classes The plugin should try each class name from the meta object in succession instead of giving up right away and just using QWidget. This improves the handling of the itemviews and makes many sub-classes of QWidget outside of Qt work. Change-Id: Id81017c648fe229c3eb85d6d9ae6696d5f16a1ef Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> 22 March 2013, 16:11:17 UTC
f4609b2 QThread: fix race when setting the eventDispatcher Use QAtomicPointer to make this thread-safe. Change-Id: If71f204699fcefabdb59bd26342d777d1cc9e2a7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> 22 March 2013, 15:44:51 UTC
85b25fc Remove racy setting of eventDispatcher to 0. This is inconsistent (e.g. the glib event dispatcher doesn't do this) and unnecessary (already done by QThreadPrivate::finish before deleting the event dispatcher, and by the QCoreApplication destructor). Change-Id: Ib98147953a5e71ec87aab0ec7ef5063bb7d80134 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> 22 March 2013, 15:44:47 UTC
9c6f27c Fix installation of Android java files The installation of the java files does not depend on Qt, so it can be built before the rest of Qt, which means we need to remove the default dependency in qmake, otherwise we can get an error message: Project ERROR: Unknown module(s) in QT: gui core Change-Id: Ibb968acf6ec06c91ccfd5002e08c93c96a209934 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 22 March 2013, 15:34:07 UTC
ab340e8 renameOverwrite: don't allow cross-partition copying This matches the Unix behavior, and ensures atomicity (as required by QSaveFile) Change-Id: I54ec98bcd7a0714ca968cad627a5e4d684fd7af6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 22 March 2013, 12:29:13 UTC
98e704a Update WEC7 ARM mkspec. Added QT_NO_CLIPBOARD, QT_NO_ACCESSIBILITY and opengles2 libs. Clipboard and accessibility are not supported in WEC7. Opengl ES2 libs are required for building qtgui (and other opengl dependent) modules. Change-Id: Ie45612bd7bada00bfcb92a0885c4bd685b82bd02 Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 22 March 2013, 12:21:44 UTC
c2bdfc3 QWindowsVistaStyle: fix checkbox animations for QtQuick Controls Change-Id: I740dfab748fe9cc79a861c549030ff9e9e608df2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> 22 March 2013, 12:05:27 UTC
4824c74 Fix error in XML and Xunit formatted benchmark output. The number of iterations was not respected for XML output, unlike for plain text output. With this fix, benchmarks report the same result for plain text and XML formatted output. Compare the change to qplaintextlogger.cpp:274. Change-Id: Ieb3e5812e18d93c36847bef0417f779efd300f86 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Jason McDonald <macadder1@gmail.com> 22 March 2013, 11:59:01 UTC
04770e5 qdoc: List of all members subpage redesigned The subpage listing all the members of a QML type, including the inherited members, was trying to use an old format that works ok for C++ classes but is not optimal for QML types. The redesigned format for QML types still lists all the members but it lists the members for each base type in a separate list. The members for a QML type that has been marked as abstract are listed with the members of the type that inherits the abstract type. This fix does not fix QTBUG-30111, which will be fixed in a separate commit. This means that some links on the subpage generated by this change will be links to a page that doesn't actually contain any documentation for the linked member. But it will eventually. Task-number: QTBUG-30114 Change-Id: I8ae4227d1eaecdbc24a4ac9b8119f0ced2cdee92 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 22 March 2013, 11:13:23 UTC
bf3a5cc QThreadDataPrivate: fix data race on canWait boolean. postEvent() accesses it with the postEventList mutex locked, but processEvent() was checking it without any mutex locked. Change-Id: I31bbb50f7a1c337067b8e3de16ee7cd11400b517 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 22 March 2013, 11:12:36 UTC
49d7e71 QEventDispatcherUNIX: turn interrupt bool into an atomic int. It's read and written by different threads, so this was a race. Change-Id: Ieffaa169eb67f40dc935291b3994f9ff1c7e05f0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 22 March 2013, 11:12:22 UTC
ef502d4 Initialize gen_ variable Change-Id: I87e0b2e11670ea71da8e4d2f718dc97dd32dd57d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 22 March 2013, 11:11:43 UTC
a8283fe Implement [QNSView isOpaque] Re-use the QCocoaWindow implementation. This gives a small performance boost since NSWindow can skip drawing the background if it knows that the content view will fill with opaque pixels. Change-Id: I4a9a14135d890e9132dd1cb0af5a1c1a769d7e2f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 22 March 2013, 06:16:25 UTC
a87e8f7 Show warning about QBackingStore::flush() only for toplevel windows. Task-number: QTBUG-30181 Change-Id: I8c9b515af022cb204649cb1e1f344f73a224c8b7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> 22 March 2013, 05:20:19 UTC
c2a8a82 Recommit b7b858595e6e2d8dcc9debeb45eb8b9b294b9be6 This was accidentally removed as part of the merge from dev. Change-Id: I102ff0d67a136b0dbe467d83edccf02880536d7f Reviewed-by: Liang Qi <liang.qi@digia.com> 21 March 2013, 14:27:50 UTC
f8c9f96 Fix crosscompiling for Android on Mac There is no logic in configure to detect compiler capabilities in the host- and cross-compilers separately, so if the cross-compiler has more capabilities than the host compiler, the compilation will break. This was the case for c++11 on Mac, which is supported by the Android cross-compiler but not by default on the host. There is a fix planned to enable c++11 on Mac, so this is a temporary patch to work around the problem by disabling c++11 explicitly until it has been fixed. Change-Id: I2048dc7f63991c97b11b3980ac91292d2c9b7ce4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 21 March 2013, 14:27:38 UTC
53b32a0 Android: Fix use_local_libs when running from launcher Use persistent data to specify the alternative location of Qt libraries instead of command line arguments, so that the application can be run from the launcher and not just from Qt Creator. Task-number: QTCREATORBUG-8643 Change-Id: I72df2905f3f35a3b924edd47d3a5387e674c97ac Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> 21 March 2013, 14:26:58 UTC
b5a3881 Add qMenuToNSMenu() and qMenuBarToNSMenu() to QCocoaNativeInterface. Preparing the addition of toNSMenu() functions to QtMacExtras which will expose the native handle of a QMenu or QMenuBar. Task-number: QTBUG-28869 Change-Id: Ib07712f5da0758addbbf8a84d6881297420e7ac8 Reviewed-by: Harri Porten <porten@froglogic.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 21 March 2013, 14:26:47 UTC
24c10b0 Introducing QComposeInputContext When switching from Xlib to xcb platform plugin it was agreed that XIM is deprecated. Users should be using QT_IM_MODULE to load input context plugin for a more advance input method framework support. The proposed solution is to parse the compose file directly from Qt. This approach removes the overhead of communication protocols used in Xlib and/or IBUS. TableGenerator class follows [1]. The compose file is searched for in the following order: 1) If the environment variable $XCOMPOSEFILE is set, its value is used as the name of the Compose file. 2) If the user’s home directory has a file named .XCompose, it is used as the Compose file. 3) The system provided compose file is used by mapping the locale to a compose file from the list in /usr/share/X11/locale/compose.dir. Regarding step 3 - TableGenerator searches in hard-coded locations for system-provided compose files. Here I have introcuded a new environment variable QTCOMPOSE which can be used to prepend an extra location to be searched. [1] http://www.x.org/archive/X11R7.7/doc/man/man5/Compose.5.xhtml Task-number: QTBUG-28183 Change-Id: I76dcfd454f3acc23db98192a3673c1ab2af4425f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> 21 March 2013, 14:26:24 UTC
fb9cff6 Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable 21 March 2013, 14:26:18 UTC
2ab9b74 Merge remote-tracking branch 'gerrit/release' into stable Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0 21 March 2013, 07:49:01 UTC
da2f627 improve openglwindow example a bit Change-Id: I50e00c33c100beab975d0fcbfc4ccdd496cccbaf Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> 21 March 2013, 06:53:05 UTC
f7dfbb4 Send expose when we get a geometry change. Change-Id: I4c0c5130e6513fb4031e847be01feff3653f256e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> 21 March 2013, 06:53:04 UTC
7508996 window should not be resizable while its transient popup is open If a popup is transient for another window, the other window should not be resizable while the popup is open. (Resizing didn't close the popup, either.) The popup is emulated with an NSPanel rather than being a native popup, so we don't get this behavior for free. Task-number: QTBUG-30266 Change-Id: I49d04a095b428d169fe36ae1768c889578c3c054 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> 21 March 2013, 06:41:41 UTC
f1e681b QWindowsVistaStyle::drawPrimitive(PE_Frame): fix background clipping The purpose of PE_Frame is to draw the frame, not the background. The old code tried to check whether a custom base brush was set, and otherwise let the theme draw the background. That didn't work together with CSS background images. This change removes the background drawing from PE_Frame, and let's PE_Widget to draw the background using the base brush that defaults to a color fetched from the theme. Task-number: QTBUG-24783 Change-Id: Iaddfcbd613122a9aed39e77ba05a26f94995f7d2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> 21 March 2013, 00:38:45 UTC
3a6d0bb QWindowsVistaStyle: fix QTextBrowser frame Check for QAccessible::StaticText role in addition to EditableText, to get correct frame for non-editable text widgets, such as QTextBrowser. Task-number: QTBUG-24783 Change-Id: I2c3e4f4fa06c8122485b1bc6c1da04c7565c7223 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> 21 March 2013, 00:38:45 UTC
f9d856b ODBC: lost info about column metadata on SQL_NO_DATA In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata is ignored. Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53 Reviewed-by: Mark Brand <mabrand@mabrand.nl> 20 March 2013, 22:30:43 UTC
e5a11fb Merge "Merge branch 'dev' into stable" into refs/staging/stable 20 March 2013, 22:30:31 UTC
back to top