summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Rename conflicting symbol QVariantToVARIANTMiikka Heikkinen2012-12-173-14/+15
| | | | | | | | | | | | | | | It appears this method has been copied from ActiveQt. When building Qt statically, linking Windows platform plugin into any application that also uses ActiveQt will cause error about duplicate symbol. Renamed QVariantToVARIANT to QVariant2VARIANT to avoid conflicts. Renaming is done here rather than ActiveQt, as that symbol is in exported header in ActiveQt. Task-number: QTBUG-28645 Change-Id: Id0d7fc51d4455b463515e7c6178798ad61217c35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Windows: Remove warning when creating QWindowJonathan Liu2012-12-171-1/+0
| | | | | | Change-Id: I63c76710ab84c88ba8b4b6f24e6161ae2db77a5f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix focusproxy-relayed crash in QGraphicsItem destructor.Andreas Aardal Hanssen2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | Makes tst_qgraphicsitem::tst_focusProxyDeletion not crash. valgrind reported the error when running tst_qgraphicsitem. The crash was very real; when deleting an item that has another item as a focus proxy, the proxy still had a reference to the deleted item's focusProxy pointer. I'm not a huge fan of whitebox testing but thought this crash justifies a modification of the test to make it fail, instead of just passing silently with a warning only given by valgrind and friends. FTR the reason the test doesn't crash hard is that the memory is freed but not reused within the scope of the test. So the access to the pointer d_ptr->focusProxy succeeds, it just accesses memory that might as well have been reclaimed. But this is quite undefined... Task-number: QTBUG-28321 Change-Id: I2624631f5e5c2a8aa8bd4efe1fc128eba6c61f56 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* ANGLE: Always use DEF_FILE on WindowsJonathan Liu2012-12-172-2/+2
| | | | | | | | | | Building ANGLE with MinGW results in too many symbols being exported in the DLLs. Always use DEF_FILE on Windows to limit the symbols exported and eliminate symbol conflicts when libEGL/libGLESv2 is linked by other libraries that include their own version of ANGLE (e.g. QtWebKit). Change-Id: I7bb1f90d9996eabf30095323e9399efa1c23e3a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Cocoa: make accessibility hit test not crashMorten Johan Sørvig2012-12-161-0/+4
| | | | | | | | | Check if the accessibility element is valid before calling childAt. Change-Id: Id63c11f18b262c3c3a839db8ee2d11c0d7adc822 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Accessibility: Activate in QGuiApp instead of QApp.Frederik Gladhorn2012-12-162-4/+4
| | | | | | | | This makes it possible to use accessibility with QQuickWindow. Change-Id: I5fccd5f25021c4953b03e146705f48a198dbaaa7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Do not inform that a widget is not visible when it's disabled.José Millán Soto2012-12-161-2/+0
| | | | | | Change-Id: I561c8ef4c25dde8eb24260a46d284ca10cbf074d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Handle disabled state changeJosé Millán Soto2012-12-161-0/+7
| | | | | | | | Modified AtSpiAdaptor::notify to handle enabling and disabling widgets. Change-Id: I9a23f74d891aaf123d7fc094bdf63e384e1d65fe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Call QAccessible::updateAccessibility when caret moves in QTextEditJosé Millán Soto2012-12-163-1/+16
| | | | | Change-Id: I3b9e5d8e67b4928558b642a4d23aa60ae9dfde60 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Implemented AtSpiAdaptor::notifyStateChangeJosé Millán Soto2012-12-152-15/+15
| | | | | | | | | Adding a new private method to simplify notifying that the state has changed as it is something that is frequently done in AtSpiAdaptor::notify Change-Id: Idf21715b5d20212adb301ae9bca05f1edfc19946 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Remove the timestamp info in genarated filesLiang Qi2012-12-153-10/+3
| | | | | | | | | | | | | For moc, rcc and uic, then it's friendly for tools like ccache. ccache is using md5 to check file modification, but the different timestamp info will cause different md5 for same meaningful contents, it will disabled ccache. Updated the autotest for uic and rcc. Task-number: QTBUG-26589 Change-Id: I9f1dcf6cd826ad9603af6e183757bcd748c32bd1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Clean up Q_WS_WINDebao Zhang2012-12-141-5/+0
| | | | | | | | | | | | The first branch is required to MSVC. The bitfield isn't large enough to represent all possible enum values of Virtualness for MSVC. In addition, using bitfield is a premature optimisation in this case. So remove them. Change-Id: I4c5f85271d2bca1411426e6a321a795a7e783aff Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QSettings docs: replace Q_WS_MAC with Q_OS_MACDebao Zhang2012-12-141-1/+1
| | | | | Change-Id: I158ac697dea1792c1d608ebaff77388cfa343999 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Docu: fix non-ascii character where "i" was expectedDavid Faure2012-12-141-1/+1
| | | | | Change-Id: I540c530441ad184efe4e1ecc83bf99aa97c6a028 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Ensure the native filedialog starts up with the right directoryAndy Shaw2012-12-141-3/+3
| | | | | | | | | | On Mac it was not starting the dialog with the specified directory when one was present. If a filename was given as well then it would start up fine. Task-number: QTBUG-28161 Change-Id: I7cce0d065dd57e6433ce62380d4263d6e20b6e7c Reviewed-by: Liang Qi <liang.qi@digia.com>
* Mark the QDesktopServices::StorageLocation enum as obsolete in the docsAndy Shaw2012-12-141-0/+2
| | | | | | | | The enum was already deprecated but the documentation still listed it so now it is correctly obsoleted. Change-Id: I9d64fe58a5e70de7161928da2d09b4532d450274 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Fixed invalid memory read in SSSE3 image blending code.Samuel Rødal2012-12-141-1/+1
| | | | | | | | | | We need to do bounds comparison on the actual offset we're going to use with _mm_load_si128 to read 16 bytes from memory (even though we won't use the trailing bytes in the end). Task-number: QTBUG-28324 Change-Id: Id0d6094da796ca67338d8ad225fa6b2f309bbe6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Doc: entered hardcoded url for StatechartsNico Vertriest2012-12-141-1/+1
| | | | | | | | Corrected in statemachine.qdoc Task-number: QTBUG-27512 Change-Id: I5fa8b7fd39a4c3569e2652b9a60ba4426090a398 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Implicit conversion of shortcuts to string is gone.Frederik Gladhorn2012-12-141-1/+1
| | | | | | | | This only effects compilation with DEBUG_QSHORTCUTMAP. Change-Id: I184e644f2165049336cee8a6ac63a3301cf4c849 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Doc: Moved content from qtdocVenugopal Shivashankar2012-12-144-2/+293
| | | | | | | | | | | - The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove unused private member.Frederik Gladhorn2012-12-141-2/+0
| | | | | | Change-Id: I54f3f748763dd5959552df864af38558c136dc87 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix memory leak in childAtMorten Johan Sorvig2012-12-141-0/+2
| | | | | | | Delete the interface if it's not returned. Change-Id: Ia1e1f94d14584ab3af1b89a0baac5d343ffdd1f4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* D-Bus Examples: added qdoc files and pathChristiaan Janssen2012-12-141-1/+4
| | | | | | Change-Id: I59b3db3f3c5d076b60a2e6f909d7919d5126a1e6 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix memory leak in cocoa accessibility.Morten Johan Sorvig2012-12-141-1/+1
| | | | | | | | Autorelease ("delete later") the created attribute name array. Change-Id: I2d7af9eb1fd899f04c8acb90204600a2dd43fa20 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Prevent crash in childAt when there are 0 childrenMorten Johan Sorvig2012-12-141-1/+1
| | | | | | | | Fix off-by-one error. QAccessibleInterface::child() is 0-based, start the iteration at childCount() - 1. Change-Id: I0c841b692adab0aae4e8ac44c7d308cd7a176ac8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Don't use NSAccessibilityUnignoredChildren.Morten Johan Sorvig2012-12-142-2/+2
| | | | | | | | | | The function is massively ineffective on deep hierarchies and not strictly needed. (It's supposed to filter out "Ignored" children - VoiceOver will do that anyway based on accessibilityIsIgnored()) Change-Id: I9a74b5f5e9b7880e0d46d5330f7192472eac7a36 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Remove documentation for deleted methods, to fix a qdoc warningDavid Faure2012-12-141-14/+0
| | | | | | | | The methods were removed in 6cac729ae4181414f0b80361cdae3c30a3c99ca1 Change-Id: I0b4e32a143af877181e939241b6a00f5532db40d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Entered hardcoded url for <SVG 1.2 Tiny>Nico Vertriest2012-12-141-1/+1
| | | | | | | | Corrected in qnamespace.qdoc Task-number: QTBUG-27512 Change-Id: I9e0ecdb122d02f53dd3be457bfa2b358711222e0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Entered hardcoded url for Gnu EmacsNico Vertriest2012-12-141-1/+1
| | | | | | | | | | Corrected in qkeysequence.cpp Link from external-sites not working So, entered hardcoded url. Task-number: QTBUG-27512 Change-Id: I5b8d25d2b1f4f4fb0d57d2306de7f1b7c3dc40e3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add missing bit in initialization.Frederik Gladhorn2012-12-141-0/+1
| | | | | Change-Id: I1de8dcd8714f1700ac03d7c1e8536f10a031cef9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* add missing include when Q_NO_USING_KEYWORD is definedJing Bai2012-12-141-0/+3
| | | | | | Task-number: QTBUG-28446 Change-Id: I348de023035a15f3c769610abdaf0ebd7273ca34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: recommend using QVERIFY with QSignalSpy::wait, so people don't forget.David Faure2012-12-142-0/+7
| | | | | Change-Id: I63a04b64368a4b8aa6cfea88780b8dd6ba38b8bf Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix styleName support in QPA font databaseJiang Jiang2012-12-149-41/+37
| | | | | | | | | Font styleName support was disconnected since Qt switched to QPA fontdatabase. Now add the code from Qt 4.8 back to enable this in QPA. Change-Id: Iab2cbfd5468f87542183348c2123ca4b2c270692 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ie81507ed011fc096e0f5edad146e97c392e86494 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fixed deadlock situation in QtOpenGL's texture management.Samuel Rødal2012-12-141-0/+5
| | | | | | | | | | | | | | | | | | QGLTextureCache::remove(qint64 key) locks the QGLContextGroupList mutex before removing a texture. Removing the texture might cause the QGLShareContextScope construct to be invoked, which calls QGLContext::currentContext(), which will wrap a current QOpenGLContext in a newly created QGLContext. That also triggers the creation of a QGLContextGroup object, which will register itself with the QGLContextGroupList, an operation that again will lock the QGLContextGroupList mutex. To prevent this from deadlocking we make the mutex recursive. The whole QGLShareContextScope approach is really broken and should be replaced, but for now it's what we have in QtOpenGL (QtGui has the replacement QOpenGLSharedResource). Change-Id: Id1ff69035af3f31b690892c03f74748d052a278b Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* XCB: add support for getting and setting appTime and appUserTime.David Faure2012-12-148-6/+66
| | | | | | | | | | | | The QX11Info class needs this. This required adding the missing nativeResourceFunctionForScreen in QPlatformNativeInterface. Change-Id: I2c6e91c7f122f3ecdf769a177deafd2aa3896e2f Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix empty window title regression, add application display name to window titleDavid Faure2012-12-144-35/+42
| | | | | | | | | | | | | | | This increases consistency a lot: all windows and dialogs from a Qt application will show the app display name in the caption, on Windows and X11. This helps identifying which app a dialog belongs to, which is especially useful when the dialog is very generic and shows up unexpectedly. For compatibility reasons, the app name is added to the caption only if setApplicationDisplayName() was called -- or if the caption would be completely empty. The standard Qt4 case (setWindowTitle + no display name) is unchanged. Change-Id: Ib284c62c1f4c0bc923e5bc2d10247d95e9aa76c1 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fixed incorrect handling of extra mouse buttons in XCB platform plugin.Samuel Rødal2012-12-144-59/+87
| | | | | | | | | | | | | | | | | | | | | | translateMouseButtons() was only able to correctly handle the left, right, and mid mouse buttons. Thus, if any buttons outside of those were pressed, the motion notify event would basically unset the mouse button mask, leading to a release event being sent instead. Later on, when the actual release event arrives, that button gets xor'ed into the empty button mask generating another press, and later another motion event will generate a release. In the end that means two press-release sequences are sent for any extra mouse buttons. Instead of getting the mask of the buttons currently being pressed from the event, we need to keep track of the mask ourselves. Task-number: QTBUG-28561 Change-Id: Iaa67e784a13d792deef8fc29dbd5456a5471a861 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix warning - unused variable (d-pointer)Frederik Gladhorn2012-12-141-2/+0
| | | | | Change-Id: I6bc47f12e60bfbda60e3f242d3b680d5684903ea Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Added missing detach() to QJsonObject::take()Denis Dzyubenko2012-12-131-2/+3
| | | | | | | | | We also need to detach() the taken value in case the compaction triggers and modifies the underlaying data. Change-Id: Idcdeba4236b8e208d107d41be2decbdfc5721300 Reviewed-by: Bjørn Erik Nilsen <post@bjoernen.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Add missing WARNING header.Stephen Kelly2012-12-131-1/+4
| | | | | | Change-Id: I6565bda336c152dfdc0cb49f168d90bdceacb2b1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QGtkPainter::reset() to reset the clip rectJ-P Nurmi2012-12-131-0/+1
| | | | | | | | | | | | Due to preparation for GTK3 support, QGtkStyle::drawXxx() no longer creates a local instance of QGtkPainter upon every call, but QGtkStylePrivate::gtkPainter() will (in the future) dynamically choose between QGtk[2|3]Painter. The same painter instance is now re-used between the calls, but wasn't properly reseted between. Task-number: QTBUG-28557 Change-Id: I29be318dbb54d97ed23dfb88d406a3a833db4369 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix some WS errorsCorentin Jabot2012-12-132-3/+3
| | | | | | | | | Fix whitespace errors in qabstractsocket.cpp and qlocalsocket_win.cpp Change-Id: Ifd0cb86a8e63a1d0ef8a5846a7f893acf9f63542 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Docs: Fix referencesChristian Stenger2012-12-138-16/+18
| | | | | Change-Id: I48173186afb874d307010f4f303d0e4f97ec0287 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix QWidget::setWindowOpacity() when called before show().Friedemann Kleint2012-12-126-4/+19
| | | | | | | | | Pass opacity from the QWidget to QWindow and to the platform windows. Task-number: QTBUG-28477 Change-Id: If5a85d9183bd1ca33dac2052936ecd1e6c0b5f6c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QMenu: Do not set snapToMouse if a caused-widget exists.Friedemann Kleint2012-12-121-1/+1
| | | | | | | | | | | | When clicking at the bottom-right corner of a menu in a menu bar, it appears at the wrong position. Add test and stabilize RTL-tests by making sure the layout direction is cleared should they fail. Task-number: QTBUG-28031 Task-number: QTBUG-2596 Change-Id: Ibc5ae916388753908e9f3ee98e8859faaa0c8723 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Accessible: Improve value interfacev5.0.0-rc2Frederik Gladhorn2012-12-127-31/+56
| | | | | | | | | The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* DirectWrite support on MinGW needs _WIN32_WINNT to be set to 0x0600Erik van Pienbroek2012-12-121-0/+5
| | | | | | | | | The file qwindowsfontenginedirectwrite.cpp uses the Win32 API function GetUserDefaultLocaleName which requires _WIN32_WINNT to be set to 0x0600 as it only became available in Windows Vista Change-Id: I704705d3fc729bb0167121de991d01c957e1e7e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* OpenGL Examples: added example path for QtCreatorChristiaan Janssen2012-12-121-0/+2
| | | | | | | This was introduced in patch 8534bb3d, then overwritten by c85ca8d1. Change-Id: I6b7489e2b2f3311822c282f50c74bd68c787229d Reviewed-by: hjk <qthjk@ovi.com>
* De-inline all setters in QWindowShawn Rutledge2012-12-122-77/+84
| | | | | | | | | | | | | | | | If we don't do this, we can have binary compatibility issues later. For example https://codereview.qt-project.org/#change,41700 will change the behavior of setWidth and setHeight to call setSize instead of setGeometry, because we don't want changing the height to also set the position of a window; if x and y are left uninitialized it needs to remember that fact. But if setWidth is left as an inline method, calling setGeometry, then an application which was built with 5.0 would behave differently than an application built with 5.1, even if Qt is upgraded after the application was built. To generalize, setters should never be inlined. Change-Id: I1ec42cb61a45fe541b3f3bb99d1b1ca24ad2a517 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 01:21:27 +0000