summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QStyleAnimation: use QAbstractAnimation::DeleteWhenStoppedJ-P Nurmi2013-01-122-2/+1
| | | | | | | | | | This ensures that unexpectedly stopped (for example, when minimizing a window) style animations are removed from QCommonStyle. Task-number: QTBUG-28978 Change-Id: I1403502d85e0614d8644892a2231938c29a8c9c2 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* MinGW: Statically link runtime libraries into qmakeKai Koehne2013-01-122-1/+2
| | | | | | | | | | Avoid runtime dependencies to e.g. libpwinthread-1.dll, libstc++-6.dll. This prevents Qt Creator from spitting out error dialogs on each startup for registered MinGW versions that aren't in the default PATH. Change-Id: Id55518db8c8e0521b6a41add1eaf38f75a892c8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove definitions of QMAKE_{LIB,INC}DIR_QTOswald Buddenhagen2013-01-111-2/+0
| | | | | | | they are gone from all other specs Change-Id: I93f5800971733af9d9dbc66c7a900d1e2e967473 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add missing space in front of "directwrite" flagOswald Buddenhagen2013-01-111-1/+1
| | | | | | Task-number: QTBUG-28917 Change-Id: I8b86b96a3fb6b65f71aea6954ba8dfa520f5d909 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* set pkg-config host_bins directly to install dirOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | | | | | | qmake tries to replace all occurrences of the install prefix with a literal ${prefix}. of course this would mess up build paths which happen to live under the prefix (this is untypical, but still), which would break the sed magic in the subsequent install step. as qmake itself has no use for the .pc files, it's ok to target them directly for the install dir. we do the same with the include and lib dirs already. Task-number: QTBUG-28807 Change-Id: I53d7f0f3b357f67f30bea07554794f60160376cd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Minimized, maximized and fullscreen are mutually exclusive.Shawn Rutledge2013-01-111-0/+2
| | | | | | | | | | Only if minimized does QWidgetWindow need to remember the previous state. Maybe it's OK to restore from fullscreen to maximized though. Task-number: QTBUG-29030 Change-Id: I1e2724c8811366c9536a3e372ce281e8d473a4ac Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Rename qt_mips_asm_dsp.h to a "_p.h" headerThiago Macieira2013-01-095-3/+25
| | | | | | | | | | | It mustn't be installed and it mustn't be available in the master include. It's an assembler header anyway. Also, take the opportunity to add the "We mean it". Change-Id: Id4233e5bda458714a0d329549afe499d861acc56 Reviewed-by: Adrian Perez de Castro <aperez@igalia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Define Q_COMPILER_AUTO_FUNCTION for MVSCThiago Macieira2013-01-081-0/+1
| | | | | | | | | This definition was missing. It's clear MSVC supports this feature because it has been in use in qtconcurrentrun.h under an #ifdef Q_COMPILER_DECLTYPE, which is defined for MSVC. Change-Id: Id76198b2be8bba13fd00c65d6d4f73d3ef601449 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* test: Add bic data for linux-gcc-ia32Sergio Ahumada2013-01-088-0/+59020
| | | | | | Task-number: QTQAINFRA-321 Change-Id: I990f0c525fbd0b0b3818b0f7d86ed99438821baa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compile when QT_EVAL is definedAndy Shaw2013-01-081-3/+3
| | | | | | | Change-Id: Id1acae0c5941e5409ca540017c0c0139e1cc4d2f Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Fix QNX QPA plugin clipboard implRafael Roquetto2013-01-081-2/+7
| | | | | | | | | | | | QQnxCliboard::setMimeData was not cleaning the system clipboard aproppriately when m_mimeData != 0 but m_mimeData->userMimeData == 0, as it would return early before the empty_clipboard() statement. Also, we need to emit the dataChanged() signal after the clipboard has been cleared as well. Change-Id: Ie06609e6e3a0a0135f1cdb6cf4c90b490ef2fc28 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix warnings about not being able to set Window geometry on Windows.Friedemann Kleint2013-01-0817-5/+171
| | | | | | | | | | Fully decorated windows cannot be smaller than 160x30 (Large fonts). Enlarge Windows or remove Window frame to get rid of decorations. Task-number: QTBUG-28611 Change-Id: Idb6ee94fb8d0760d5f97042b3084557f11e9fdf9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add auto test for HTTP cache fix for QTBUG-28035.Michael Brüning2013-01-081-0/+125
| | | | | | | | | Adds an auto test that verifies that the replies to POST and PUT requests are not cached even though they contain a max-age header and that subsequent GET requests are reloaded from the server. Change-Id: I188ae1200cb5551e164722c0f479719be8d11bfb Reviewed-by: Peter Hartmann <phartmann@rim.com>
* don't overquote deps on .pc and .la filesOswald Buddenhagen2013-01-081-6/+2
| | | | | | Change-Id: I00c268b1c0316b6deb0c4e1b2a0c7428e312c682 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* do not fixify + create QMAKE_{PKGCONFIG,LIBTOOL}_DESTDIROswald Buddenhagen2013-01-081-2/+2
| | | | | | | | | these variables are somewhat magic: they are relative to DESTDIR, and they also specify the installation location relative to target.path. the actual output directories are created by other code. Change-Id: Iead3006057516f5a49b6fd4bd8996a062c984fce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Replace macro qdoc with Q_QDOCDebao Zhang2013-01-0847-100/+100
| | | | | | | | Both qdoc and Q_QDOC are used in source code, which looks not good. Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix DnD when using QSimpleDrag.Sergio Martins2013-01-072-3/+15
| | | | | | | | | | | | | | | | qApp->topLevelAt() returns the QShapedPixmapWindow that the DnD operation created, but what we want is the QWidgetWindow. QWidgetWindow has the code to handle QDragMove events. In Qt4, QShapedPixmapWidget had a parent, so was never returned by qApp->topLevelWidgets(). In Qt5 we must filter it out. Bug is visible in the QNX plugin, which is the only user of QSimpleDrag. Change-Id: I920da86f3a1a92ce8e087f5948292fa4c68d4d81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QWindowsVistaStyle: fix frame renderingJ-P Nurmi2013-01-071-22/+26
| | | | | | | | | | A regression caused by 79a389 - it should only draw a styled frame for text input widgets. Task-number: QTBUG-28876 Change-Id: I5cda920b7db55f35e0ab6cee460c0e27951d29b9 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add QStyleHelper:isInstanceOf()J-P Nurmi2013-01-072-3/+16
| | | | | | | Task-number: QTBUG-28876 Change-Id: I343dff1c47c52e0431c09b6097da09f34e626f54 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* fix QMAKE_MAKE for qtCompileTest for cross building modulesMark Brand2013-01-071-5/+9
| | | | | | | | | | | | | Cross bulding on unix for mingw exploits the fact that makefiles generated for mingw work with plain make. There is no mingw32-make, so this is the only option. Arguably, plain make could also be used in an MSYS environment, perhaps detected by MINGW_IN_SHELL, but there might be good reasons I don't know about not to do this. Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix warning about cast from ASCII.Friedemann Kleint2013-01-071-1/+1
| | | | | Change-Id: I5434ece3b1bd0c56ca4481a68dd67e914715bc28 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Fix warnings about unused functionsThiago Macieira2013-01-071-1/+2
| | | | | | | | | | | | | | | | | The operator<= and operator>= overloads for QPoint are used only with Q_ASSERT. Clang was correct that they are not used. Even though they are inline, Clang reports the functions as unused because they were inside an anonymous namespace. So take the off the namespace. They are correct for external use, should they be exported by accident (which they aren't now). painting/qpathsimplifier.cpp:76:13: error: unused function 'operator<=' [-Werror,-Wunused-function] inline bool operator <= (const QPoint &a, const QPoint &b) Change-Id: I67415621e777fd0d59cbdede26c34d8bb13f7346 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Add bic data for tst_bicSergio Ahumada2013-01-069-7/+59027
| | | | | | | | | - Add initial set of amd64 data - Add QtWidgets to global.cfg Task-number: QTQAINFRA-321 Change-Id: I9bffaa00ac01976546629988ac69965383eb2efd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update qlocale autotestMehdi Fekari2013-01-061-0/+50
| | | | | | | | | | | Add additional tests for the updates in the Qt4.8 qlocale data (CLDRv2.0) already existing in Qt5 locale data (CLDRv22.1): - The NumberingSystem for some Indic and Slovak locales. - The Month/Day name in Irish/Gaelic locale. - The AM/PM Text in Turkish locale. Change-Id: Iaea4f13ec79f94ab937b97f8ae60eb8d8f217c4b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Tests: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-069-16/+0
| | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: Ifd116dee32a450ff89a9a1011e26b434765d6e95 Reviewed-by: David Faure <david.faure@kdab.com>
* configure: Remove left over for -nokia-developer optionSergio Ahumada2013-01-041-7/+0
| | | | | | | This seems to be a left over from 52fc6694b87e93fe0828424bb26d9279785de3e7 Change-Id: Ib0d5868a099e53ec2c2af6be749a5496bbf1f145 Reviewed-by: Jeremy Katz <jeremy@panix.com>
* Disable Q_COMPILER_RVALUE_REFS on QNXRafael Roquetto2013-01-041-0/+3
| | | | | | | std::forward and std::move are not yet supported by the NDK. Change-Id: I1df1b5e88717c0d27a280862b98eb68262927f2b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Widgets: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-0438-91/+1
| | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: Ibe8e2ec867afb4051a3c7eef806d9cd86945928b Reviewed-by: David Faure <david.faure@kdab.com>
* remove unused member from QSystemLocalePrivateJoerg Bornemann2013-01-041-3/+0
| | | | | | | | | This is a refactoring leftover from commit bb86e77cc437b92d49692bb7026c57626d77079f in qt/qt.git. Change-Id: I04993faca44ad0ffca2ae163049770c29d232a47 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Remove redundant Q_OS_BLACKBERRY define check.Rafael Roquetto2013-01-041-2/+2
| | | | | | | Q_OS_QNX is always implied by Q_OS_BLACKBERRY Change-Id: Ic07a967ab9a45b3c6c088aa8399bab823b9a413e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Gui: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-0417-50/+0
| | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: I95b8b4b674e85b2b3c374931f6231d60f35be984 Reviewed-by: David Faure <david.faure@kdab.com>
* Core: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-0426-61/+0
| | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: I54523eb854619917123d8816d3cd6c3a1f5b4c55 Reviewed-by: David Faure <david.faure@kdab.com>
* Update the sysconfdir default to non-absoluteThiago Macieira2013-01-041-2/+2
| | | | | | | | | Make the settings path to be relative to $prefix, instead of absolute. And update the configure -help output to match the actual code. Change-Id: I71e4ad6e3db046fec95ef057ae7f7bc566bc5794 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Don't increase the reference count if dynamic_cast failedThiago Macieira2013-01-045-0/+176
| | | | | | | | | | | | | If the dynamic_cast failed in QSharedPointer::dynamicCast or qSharedPointerDynamicCast, we should avoid creating the QSharedPointer that shares the weak and strong reference counts. In Qt 5, this does not imply a leak since the original pointer is stored internally for deletion. In Qt 4 it implies a leak under certain circumstances, which this change fixes. Task-number: QTBUG-28924 Change-Id: Id2de140de4cf676461e14b201ad250c53666b79d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* SSL certificates: blacklist mis-issued Turktrust certificatesPeter Hartmann2013-01-043-0/+58
| | | | | | | | | | | | Those certificates have erroneously set the CA attribute to true, meaning everybody in possesion of their keys can issue certificates on their own. Task-number: QTBUG-28937 Change-Id: Iff351e590ad3e6ab802e6fa1d65a9a9a9f7683de Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Do not send QAccessible::Focus when current index is changed.Jan Arve Saether2013-01-041-3/+5
| | | | | | | | | | | | This had the unfortunate side-effect that focus was reported to change (but it didn't) just because the qtabbar was shown. Found by clicking the different categories on the left-hand side of the options dialog in Qt Creator. So, what happened was that clicking "Text Editor" would move the accessibility focus (that the AT client saw) to the "Font & Colors" tab) Change-Id: I19a508f6a32a77696079d24c3c6408cb6c3d9fd5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Make textEditTest pass on Windows 8Jan Arve Saether2013-01-041-4/+19
| | | | | | | We make it pass by relaxing the comparison of the characterRect.... Change-Id: I900e0601d9e1e568c12a3952cf42657743345013 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix autotest of textEditTest to use currentFont() instead of font()Jan Arve Saether2013-01-041-3/+3
| | | | | Change-Id: I5c9b2ad494a7daf9b07804f77c4692d49e774261 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* DBus: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-045-48/+0
| | | | | | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. In some cases, the type is required to be registered with the typedef name, so those Q_DECLARE_METATYPE uses remain for now. In a future patch we can also remove those and the typedefs themselves. Change-Id: I5721955c86f566ae09024203954840f817bd3088 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fixed wrong emits of x/y/width/height changed signals in QWindowSamuel Rødal2013-01-041-9/+9
| | | | | | | | | | We should only emit these when the corresponding property value changes. Since these are changed asynchronously in the case of a platform window, we should not emit them in the setter, as they are already properly emitted in QGuiApplicationPrivate::processGeometryChangeEvent(). Change-Id: I5ac00601ddb4e7a8ff02376e5f5135d427913119 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix QGuiApplication::keyboardModifiers() and QGuiApplication::mouseButtons()Jon Severinsson2013-01-044-12/+72
| | | | | | | | | | | | | | | | | Previous commit b2363a935c8dac fixed keyboardModifiers() after QPA event processing, but broke QTestLib, which expects spontaneous input events sent to qApp->notify() to update keyboardModifiers() and mouseButtons(). The commit also did not fix mouseButtons() after QPA event processing, and missed keyboardModifiers() after QPA Tablet event processing. This commit fixes all these shortcommings in b2363a935c8dac. Includes test case by David Faure <faure@kde.org> Task-Number: QTBUG-26887 Change-Id: I8518b06c4ce86ea7b35120e3353a45ea2a81d356 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Cocoa: Fix zombie NSScreen crashGabriel de Dietrich2013-01-042-9/+14
| | | | | | | | | | | | While the Cocoa documentation says we should not cache [NSScreen screens], it seems that we should not cache its referenced objects either. This caused a crash in desktop components when using Dial because, given the way it is being rendered, we need to know the screen pixel ratio. Task-number: QTCOMPONENTS-1279 Change-Id: If5c3c6f14d04925215b9dca011143a2056a68846 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Windows: Add fallback for UpdateLayeredWindowIndirectJonathan Liu2013-01-041-4/+9
| | | | | | | | | | The UpdateLayeredWindowIndirect function is only available on Windows Vista and later. If UpdateLayeredWindowIndirect is not available (e.g. on Windows XP), use UpdateLayeredWindow instead. Change-Id: I8af23c051560f7e54eda390dae7553543c00a94b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Revert "Enable module build with QT_NO_ACCESSIBILITY"aavit2013-01-0415-58/+10
| | | | | | | | | | This reverts commit b7f63c6bf74a0eb62bb49c1085584da1b3714a06. It made compilation fail in qstylehelper_p.h if QT_NO_ACCESSIBILITY was defined - which it is by default on linux without dbus. Change-Id: I313f5138460d28c44dad128d175df0e53a99287d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* BlackBerry: Reevaluation of timer list in event dispatcherBernd Weimer2013-01-041-10/+21
| | | | | | | | | | In the event dispatcher the timer list has to be reevaluated after each call to filterEvent, because timers could be started in event filters. Change-Id: I1a275845fb74c63441f2301555f3459f8295af27 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QGtkStyle: exclude Xlib calls on MacJ-P Nurmi2013-01-031-1/+10
| | | | | | | Task-number: QTBUG-28769 Change-Id: I3f83b6011acf43e5136a762d0f8841b3a910cecb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Cleanup verifyHierarchy. Remove dead code and add indexOfChild testJan Arve Saether2013-01-031-5/+3
| | | | | Change-Id: I4f423cf2f08b657329b7fb5e225e7b8b3f17e4af Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Do not crash in the bridge because of inconsistent hierarchyJan Arve Saether2013-01-031-2/+4
| | | | | Change-Id: I732b624b9918ff4ab59ef46322fd42167b438a8d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Clarify how two digit years are parsed by QDateTime::fromString().Mitch Curtis2013-01-032-1/+27
| | | | | | | | | | It's currently not obvious that two digit years will always be in the 20th century (1900's). Task-number: QTBUG-28797 Change-Id: I7dee9a46e0cb803a8f097debc5443d1789c2f16c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Benchmarks: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-038-15/+0
| | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: Iba4b7f8ff7a1c7974d144b955cbf064e43b36ec7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>