summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix objcopy config test for concurrent make processesWolfgang Bremer2014-04-151-7/+1
| | | | | | | | | The make targets had no dependency to the built binary. Therefore when building with multiple make processes(-j8) it was not guaranteed that the binary was available for the objcopy tests. Change-Id: Ifd04e3f49fdadf030e82e81498668899ad4e7fd3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* snuff -L/-I with system paths when installing meta filesOswald Buddenhagen2014-04-152-5/+11
| | | | | | | Task-number: QTBUG-37963 Change-Id: I8e268387f9dc33d7fab76395301b1396ca0445ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* de-duplicate setup of libdir replacement in prl filesOswald Buddenhagen2014-04-154-29/+13
| | | | | | Change-Id: Ia93fa02d9e63597d3347fee3aaf2aca65e7cc83a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* reshuffle code for clarityOswald Buddenhagen2014-04-151-21/+17
| | | | | | | move a bit around, nest/de-duplicate dependent conditionals Change-Id: I048bd3f409ce42b4138bccb28fcc513840202e7a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't attempt to replace include paths in meta filesOswald Buddenhagen2014-04-151-7/+4
| | | | | | | | | neither .prl nor .la files even contain include paths. in .pc files, we assign the final path to start with, so there is nothing to replace, either. Change-Id: I919dfa01e0a1d0ef8ef1220174de1d33c66cedf9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* properly replace windows paths in installed qml plugin prl filesOswald Buddenhagen2014-04-151-0/+1
| | | | | | | amends 53f48a4b, take 2. Change-Id: Ia20d7879e4e1b6a34d5bb9e36b4fd7f17139b5fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* enable path replacement in installed qml plugin prl files on all platformsOswald Buddenhagen2014-04-151-8/+6
| | | | | | | amends 08a2d8df4, take 2. Change-Id: If827612caf15b0d5d79fea38fa4915b1d36743d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix default QMAKE_PKGCONFIG_LIBDIROswald Buddenhagen2014-04-151-1/+1
| | | | | | | | | it needs neither native separators, nor a trailing separator. the QMAKE_PKGCONFIG_INCDIR default was already ok. Change-Id: I1048b3870fd3ca09aa76b41aecda7d90402aa64a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't emit -L/-F/-I with system dirs to .pc filesOswald Buddenhagen2014-04-151-5/+11
| | | | | | Change-Id: Idecb6f8ba61872c23856a8c7e22305c01c67f0b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* Unite the documentation for qmath.h functionsAllan Sandfeld Jensen2014-04-152-101/+78
| | | | | | | | | | Some functions in qmath.h was documented under QtMath, and some under QtCore/qmath.h, the latter does not appear to lead to functional links in the function list, so we should move them all to QtMath. Task-number: QTBUG-37799 Change-Id: I3118c65ccbfb2401bdc324dbef2885d4e7d1c8f6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Add make check target for iOSSimo Fält2014-04-151-0/+6
| | | | | | | | | | Enabling check target to run test apps in iPhone simulator. Task-number: QTBUG-36639 Change-Id: I700d998fe9f1a6c910431789e98e4789d820f3e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix crash when deleting top level windows embedded into QGraphicsProxyWidget.Friedemann Kleint2014-04-142-7/+4
| | | | | | | | | | Clear proxyWidget pointer in slot QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot(). Task-number: QTBUG-29684 Task-number: QTBUG-33213 Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* QNX: Skip QGLBuffer autotestFabian Bumberger2014-04-141-0/+4
| | | | | | | see QTBUG-38275 Change-Id: If9a329b07f83ace77b05336d16534032310e0f82 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Fix QDockWidget autotestFabian Bumberger2014-04-141-1/+4
| | | | | | | | | | Show translates to showFullScreen on some platforms. This patch replaces show with showNormal in the "task248604_infiniteResize" test. On BlackBerry the test is skipped because all top level windows are forced fullscreen by the platform. Change-Id: Ia974c3fcbd0c71c107f4cc3f8405b8ef79ffb5b7 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* BlackBerry: Fix QDoubleSpinBox autotestsFabian Bumberger2014-04-141-0/+2
| | | | | Change-Id: I380e983294c4467ad79f0835c05387a0ee155eb5 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Fix QComboBox autotestFabian Bumberger2014-04-141-7/+7
| | | | | Change-Id: I9fe4da6e02921c0474bf7ef31a2ba14e751584bf Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Fix QDir::entryInfoList()Bernd Weimer2014-04-145-13/+14
| | | | | | | | | | | | If D_FLAG_FILTER is set, duplicate name entries are filtered out, so this flag has to be set along with D_FLAG_STAT in the call to dircntl. Also releaved dependencies between defines__EXT_QNX__READDIR_R, __EXT_QNX__READDIR64_R and _POSIX_THREAD_SAFE_FUNCTIONS Task-number: QTBUG-38189 Change-Id: I4e620cb9967e3d1baf6f2109a7c83703702f805b Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix documentation of QRegExpjkobus2014-04-142-3/+3
| | | | | Change-Id: I6c9083941eb791eb34ce982986e3e04ac5a765ad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QNX: Fix QMdiArea autotestsFabian Bumberger2014-04-141-3/+6
| | | | | | Change-Id: I1c4b0bbe4984182c217ee97957e2f21f43caf116 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
* QNX: Fix QGuiApplication autotestsFabian Bumberger2014-04-141-0/+36
| | | | | | | | On QNX a window can only be activated if it has either a egl surface or a raster backingstore. Change-Id: If075093e39f1553eb8b25e35f7d372b1b15aa8af Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Fix QWizard autotestFabian Bumberger2014-04-141-1/+4
| | | | | | | | | | | In "task177022_setFixedSize" show was replaced with showNormal because on QNX and some other platforms show translates to a showFullScreen. For BlackBerry the test is skipped because the first top level window is always forced into fullscreen mode. Change-Id: I9df37c6bc47b47cbad4a1623b3eafa723abc6714 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Restrict QFontComboBox's popup width to screen widthFabian Bumberger2014-04-141-2/+5
| | | | | Change-Id: I5a92308beb2f245d9f031918bb8154757316ef56 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QNX: Fix QTreeView autotestFabian Bumberger2014-04-141-2/+2
| | | | | | | | | The style is dpi dependent. I.e. on high dpi displays the pixel size of sections and rows of a QTreeView will be larger. Change-Id: I7477bfdd641d4db67973cafef5147f026f72c111 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Doc: Remove QX11EmbedContainer/QX11EmbedWidget snippetsSze Howe Koh2014-04-142-128/+0
| | | | | | | | - These classes no longer exist in Qt 5 - These snippets are not actually used in current docs Change-Id: I155e70b09933417c8ce1b14d033fb1c17a1c32db Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Handle parent is None from query_tree_reply in QxcbWindow::frameMarginsMartin Gräßlin2014-04-141-1/+1
| | | | | | | | | | None is a valid return value for parent in xcb_query_tree_reply_t. If that is used as the new parent the next call to xcb_query_tree_unchecked will fail with a BadWindow error. Change-Id: Iafe29b223ca65c86ecfd40fe51e67d4bd7abc1ce Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Uli Schlachter <psychon@znc.in>
* Adding support for -separate-debug-info on win32Wolfgang Bremer2014-04-141-1/+27
| | | | | | | | | There is no valid reason why separate debug info support is missing from the win32 configure app. It can be used with proper cross compilation tool chains. Change-Id: I5cf5fba24abc3b515f893a3f5b799a0644fd3218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make objcopy config test cross platform functionalWolfgang Bremer2014-04-144-37/+65
| | | | | | | | This removes the old objcopy.test script and adds a cross platform qmake project for auto detection. Change-Id: Icc7c40d72fb0ff751d214b7351e20652f7b15945 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* check qmake/make exit code instead of looking for an executableOswald Buddenhagen2014-04-141-6/+2
| | | | | | | | | | | | | it's a bit braindead to look whether we managed to build an executable if we can simply use the exit codes of qmake and make to test for success. the windows equivalent is already doing that. this also allows us to do tests that can fail despite building an executable, or not build one in the first place. Change-Id: Ib69f9d005309d55a790dd3d89db1ee913e45b26b Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix build against older OpenSSL.Sérgio Martins2014-04-141-0/+2
| | | | | | | The declaration of q_SSL_ctrl is ifdefed, so ifdef it's usage too. Change-Id: I99a53af6f4f24ed991d39ab89f18e03b8f38c617 Reviewed-by: Richard J. Moore <rich@kde.org>
* Cocoa: Send expose event on screen change.Morten Johan Sørvig2014-04-103-1/+5
| | | | | | | | | Required to repaint OpenGL content properly. Task-number: QTBUG-38105 Change-Id: Ie9441d56bd9d1a4eb399210369592f03e19c4929 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Cocoa: Set the COCOA_MENU_ANCESTOR() also when sync'ingGabriel de Dietrich2014-04-101-1/+1
| | | | | | | | Task-number: QTBUG-38044 Change-Id: I2769bf2f4beec058c15ba1d126e59106f41dab37 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* XCB: Print error code on Xlib I/O errorsUli Schlachter2014-04-101-0/+28
| | | | | | | | | | | | | | When Xlib detects that its underlying XCB connection got into an error state, it calls its I/O error handler. However, the default implementation doesn't print the error code from XCB which might be useful for debugging. This commit adds an I/O error handler which prints the error code from XCB with a string describing the error and then calls Xlib's default error handler. Change-Id: I7f1fb3f1e8d0fdc3ac9db03ae7d154330c31db0c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Make Xcode debug info format controllable through a qmake variableTor Arne Vestbø2014-04-103-16/+17
| | | | | | | | | | The default is still DWARF instead of DWARF with dSYM for static builds of Qt, so that debug builds of the final application don't take forever to build due to generating the dSYM file. Change-Id: I370d800d7c959e05c1a8780c4ebf58fff250daa1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* HB-NG w/CoreText backend: Fix clustering of neutral charactersEskil Abrahamsen Blomfeldt2014-04-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Say you have a string with logical contents "abc ABC, " where lowercase is LTR and uppercase is RTL. In this case, the UBA will give "abc " LTR direction, and "ABC, " will get RTL. However, our itemization currently divides "ABC, " into two script items: "ABC" and ", ". CoreText will return glyphs in visual order, so for the first we will get "CBA" and for the second we will get ", ". But as the ", " item has an adapted directionality of RTL in the context of the full paragraph, it should actually be " ," visually. This caused a mismatch which broke the tst_QComplexText test with HB-NG using CoreText backend. As a temporary fix for this, we check whether the directionality of the first run in the text is different from the directionality expected by HB-NG. If this happens, it means the order of the glyphs produced by CoreText will be the reverse order of what is expected by HB-NG, and we therefore need to reverse it. Task-number: QTBUG-38113 Change-Id: I9f5a041791e4529a14041a362b2d5dd00490a38b Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Cocoa: Fix DnD when using native widgets.Morten Johan Sørvig2014-04-091-6/+28
| | | | | | | | | | | | | | | | | | | Adding a native widget such as QGLWidget often causes other widgets to become native, through native ancestor and sibling propagation. This includes QFocusFrame, which typically sits on top of item views. QFocusFrame is mostly transparent (except for the frame) and also has the WA_TransparentForMouseEvents flag set. Its window has the corresponding WindowTransparentForInput flag set. Cocoa does not know about WindowTransparentForInput. Forward the drag calls to the correct window. Task-number: QTBUG-37077 Change-Id: I02201c7027915b1e82d0cd7e9c2e787ca6b2338b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QTextImageHandler: Load @2x images on retinaMorten Johan Sørvig2014-04-091-7/+35
| | | | | | | | | | | | | | | | Look for and load "@2x" image versions. Adjust getPixmap/ImageSize to take the image devicePxielRatio into account. Use doc->documentLayout()->paintDevice() to get the target window devicePixelRatio (like the existing DPI-based scaling). In practice this pointer may/ will be null, fall back to qApp->devicePixelRatio as usual. Task-number: QTBUG-36383 Change-Id: Ib5e113b67242b5a9b3410272f2183a76a60bc773 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* OS X: Add more text editing key bindings.Morten Johan Sørvig2014-04-092-17/+25
| | | | | | | | | | | | | | | | | | | | | ctrl + K : Cut ctrl + Y : Paste ctrl + F : Cursor right ctrl + B : Cursor left ctrl + N : Cursor down ctrl + P : Cursor up ctrl + V : Cursor next page ctrl + O : Insert line separator (ctrl as in the key, not Qt::CTRL) These are low-priority (0) key sequences. Add them to the end of each StandardKey range and change the priority of an existing item to 1 where it makes sense. Task-number: QTBUG-32837 Change-Id: Id321e6c6ad4277d729b27297a1de66c4628e4201 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: Implement unified toolbar look for QTabBarMorten Johan Sørvig2014-04-097-41/+112
| | | | | | | | | | | | | | | | | | | | | | | | | Extend the unified title and toolbar gradient to tabs in document mode that are adjacent unified tool bars. Change the updateMacBorderMetrics() function to register the tab bar geometry and visibility status with the Cocoa platform plugin. The Cocoa platform plugin will then merge this area with other registered areas if possible. Add QCocoaNativeInterface::testContentBorderPosition(). This function tests whether the given point is within the unified title and toolbar area. Use testContentBorderPosition() in QMacStyle to enable code paths that skips drawing the QToolBar bottom separator line and paints the active tab background with transparent pixels to make the background gradient visible. Change-Id: I2b70f9bb0c2c59af053a691a7df538f958783dab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Cocoa: Update unified toolbar area on toolbar hideMorten Johan Sørvig2014-04-097-43/+84
| | | | | | | | | | | | | | | | | | | | | Add setContentBorderAreaEnabled() which us used to enable or disable an area. Used together with registerContentBorderArea() this allows changing the border area geometry and enabled status independently. Add section to the QToolBar show/hide event handler which calls setContentBorderAreaEnabled(). Make sure QToolBar and QToolBarLayout uses the same identifier - the QToolBar object pointer. Rename enableContentBorderArea -> setContentBorderEnabled. The "ContentBorder" is now the entire unified toolbar area while "ContentBorderArea"s are the sub-areas covered by toolbars. Change-Id: I339f381a50856e048ae40e7ffadd6a8a510c4994 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix tst_QListWidget::task217070_scrollbarsAdjusted()J-P Nurmi2014-04-091-1/+1
| | | | | | | | QMacStyle::styleHint(SH_ScrollBar_Transient) wants either a style object or the widget argument in order to return correct values. Change-Id: I2fdef0820334fa66e076a4734eb2a30c722c841c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* make cmake registration of qt plugins make use of PLUGIN_EXTENDSOswald Buddenhagen2014-04-0912-7/+30
| | | | | | | | | | | | | | | | | | instead of assigning plugins to the first module which claims the whole type, try to assign it to a module which the plugin claims to extend. as we are getting stricter in that go, somebody needs to claim the 'generic', 'platformthemes', and 'platforminputcontexts' plugin types. the natural claimant is QtGui. however, as we don't want to auto-link any of these plugins, make them all claim that they extend a non-existing module. QtGui also claims 'iconengines' plugins. the 'printsupport' plugins are also claimed by the respective module. Change-Id: I7af7c16089f137b8d4a4ed93d1577bd85815c87b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make QTPLUGIN work in prefix builds for plugins outside qtbaseOswald Buddenhagen2014-04-092-3/+35
| | | | | | | | | | | this means creating forwarding pris also for plugins. unlike for qt modules, we don't actually populate the .PATH unless it we are making a prefix build (and thus expecting it to be outside the regular location). Change-Id: Id836821cddec8d5f53d0708ae001e8eaa13cc71b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* automatically link plugins belonging to qt modules when building static appsOswald Buddenhagen2014-04-094-3/+42
| | | | | | | | | | | | | | | | the plugins already declare which modules they belong to. additionally, we allow plugins to declare which modules they "extend" - e.g., while the Quick accessibility plugin belongs to Gui's 'accessiblity' type, it makes no sense to link it unless Quick is actually linked. finally, it is possible to manually override the plugins which are linked for a particular type, by setting QTPLUGIN.<type> (to '-' if no plugins of this type should be linked at all). Task-number: QTBUG-35195 Change-Id: I8273d167a046eb3f3c1c584dc6e3798212a2fa31 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix typo in qmake source file listOswald Buddenhagen2014-04-091-1/+1
| | | | | | | | | the effect of this is negligible, as this list is only used for dependency scanning. Change-Id: Iae9fc73c8633cfc8217bc90014498d9635d53ad0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Fix template code for unordered listsTopi Reinio2014-04-092-2/+2
| | | | | | | | | | The CSS for unordered lists placed a nested list vertically too close to its parent list item. This commit fixes the issue. Task-number: QTBUG-38217 Change-Id: Ia5003f2aab197f455ed5bbea2e1ee2e6475aaffe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix a typo in QBitArray documentationJędrzej Nowacki2014-04-091-6/+6
| | | | | | | Task-number: QTBUG-37839 Change-Id: Id55d2d606b93f7f9e58ef423544e42b548035ee3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QNX: Fix QCompleter autotestFabian Bumberger2014-04-091-2/+2
| | | | | | | The tests expect a home folder which usually is not present on QNX Change-Id: I44f548a95f14414c0db6f752fd115696069a7b90 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Support for DH and ECDH key exchange for QSslSocket serversRichard J. Moore2014-04-094-0/+147
| | | | | | | | | | | | | | | | | Despite supporting DH and ECDH key exchange as a client, Qt did not provide any default parameters which prevented them being used as a server. A future change should allow the user to control the parameters used, but these defaults should be okay for most users. [ChangeLog][Important Behavior Changes] Support for DH and ECDH key exchange cipher suites when acting as an SSL server has been made possible. This change means the you can now implement servers that offer forward-secrecy using Qt. Task-number: QTBUG-20666 Change-Id: I469163900e4313da9d2d0c3e1e5e47ef46320b17 Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Only define Q_COMPILER_INITIALIZER_LISTS for MSVC 12 SP 2Frederik Gladhorn2014-04-091-1/+6
| | | | | | | | | | | | Nested initialization is broken before SP2, so just disable the whole feature as tst_qvector crashes(release)/fails(debug) Done-with: Jedrzej Nowacki Task-number: QTBUG-38186 Change-Id: I9c5c9e55c75854fc1f05a59fab2ac7dce9b37fbb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix crash when trying to place toolbar into zero-height window.Friedemann Kleint2014-04-093-20/+32
| | | | | | | | | Change QToolBarAreaLayout::item() to return a pointer and check return values in plug(). Task-number: QTBUG-37183 Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 11:00:03 +0000