summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-174-5/+19
| | | | | | | | | This is the collection of those earlier patches to libpng in Qt that are still relevant, updated as required. For details, refer to the git history of the src/3rdparty/libpng directory of Qt 4 and Qt 5/qtbase. Change-Id: Ia922441024536eec9b8ced8c3c5e4dc941ae152f Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Upgrading libpng: Adding clean copy of libpng 1.5.10aavit2012-04-1738-22763/+7982
| | | | | | | | | | | | | This commit removes the previous version of the bundled libpng (1.5.4), as well as all local modifications to it. It adds an unmodified copy of the official libpng source distribution, except that various extraneous files have been removed, as usual. The patches required to build it in Qt will follow in separate commit(s). Change-Id: I90149f87fc889c44a3b60b21cdf755020f3a8e39 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Move XFAIL in tst_QGraphicsProxyWidget on Mac OS XBradley T. Hughes2012-04-171-3/+2
| | | | | | | | | The number of paint events is correct now, but the first expected region is still incorrect. Move the XFAIL to the region comparison. Change-Id: I3e706cf703b20a0e98b644b3082172fc3142b44f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Cocoa: allow timer activation to recurseBradley T. Hughes2012-04-172-23/+57
| | | | | | | | | | | | CFRunLoopTimer's callback will never recurse. Since we are using one CFRunLoopTimer to drive all Qt timers, we need to work around this by sending all timers via a dedicated CFRunLoopSource (since these callbacks can recurse). We also need to block this new timer source along with the posted event source when calling processEvents() "manually" to prevent livelock deep in CFRunLoop. Change-Id: I375e46b6cfa0c76db678a1085314d42d8996d062 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Add QPlatformWindow::setWindowModified(bool)Bradley T. Hughes2012-04-177-10/+43
| | | | | | | | | | | | | Mac OS X provided a platform API for marking a window/document as modified. This previously worked in Qt 4, so we need to have an interface to keep this working in Qt 5. If the platform window does not provide an implementation, fallback to setting the window title. Note that this does not add any QWindow API, it's only in QPlatformWindow. Change-Id: I84c5a5df8536859157f2b1fa9e4cc647a09fd06d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Make failures in QTimeLine autotest more stable.Jason McDonald2012-04-171-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | QTimeLine appears to have very poor timing characteristics. Historical CI logs show roughly one failure in every twenty-five test runs on Windows, and less frequent failures on Mac and Linux. The root of the problem seems to be that QTimeLine's currentTime counter appears to run at a variable speed and the only guarantee is that it is slower than wall time. The frameChanged() test function waited for double the expected duration of the timeline and still found that the timeline had failed to finish in about one in every thirty test runs. The interpolation() test function also failed for the same reason, though less often. This commit makes the frameChanged test more strict so that the poor timing will be demonstrated more often, waiting only 1.5 times the duration instead of double the duration. It also makes the test fail gracefully so that this known issue won't disrupt CI when the test is made significant in a later commit. Task-number: QTBUG-24796 Change-Id: If469d43abb662e24445a9da619052eea9cf7c581 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix bug in tst_QTimeLine::duration().Jason McDonald2012-04-171-2/+3
| | | | | | | | | | | QTimeLine::currentTime() is an integer in the range [0..duration], not a float in the range [0.0..1.0]. The aim of the test appears to be to verify that currentTime() is at least 90% of the way to duration() when the timeline is almost due to finish, so verify that and give the corresponding 10% tolerance on reaching the end state. Change-Id: I38646947c3b9189a4e8e91a450c6071430ddc66a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Marked tst_QProcess as insignificant on Windows.Rohan McGovern2012-04-171-0/+2
| | | | | | | | This test hangs ~2.6% of the time in CI. Task-number: QTBUG-25342 Change-Id: I2c3531140e15edfe2dc2524e101b84e3206a4e61 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Fix tst_QDialog::deleteInExec() crash on Mac OS XBradley T. Hughes2012-04-172-2/+0
| | | | | | | | | | | | | | When destroying a window immediately after showing it, we can sometimes provoke a crash in Cocoa after the show-window-animation has finished (which appears to assume that the window's view will always be valid). Prevent the crash by not removing the view from the window. When recreating a window, we explicitly release the old window, but we do not release the view, so we can freely add it to the new window (i.e. this does not introduce new bugs related to recreating the platform window). Task-number: QTBUG-24977 Change-Id: I466ce75b04785401032a0a2d4a2c494910cd1672 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Reintroduce testlib to widget free buildsDonald Carr2012-04-171-1/+1
| | | | | | | | | | testlib now compiles without widget support and it will be great to get this code path QAed and testable. Change-Id: Iceb641bf04fdac84ef0a0f86d0abb83f4c66bf80 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add support for iOS.Qt4iOS2012-04-171-0/+5
| | | | | | | | | Provide support for platforms with older implementations of realpath() (eg. iOS). Change-Id: Iec7f73c8014d238ae6a2cb2fa836b36b89ce4ef6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* qmake vc(x)proj generator: don't create bogus directoriesJoerg Bornemann2012-04-171-0/+3
| | | | | | | | | When creating the temporary project object, Option::output_dir must be adjusted temporarily. Task-number: QTBUG-22788 Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake/Win: fix incomplete generated version resourceJoerg Bornemann2012-04-171-1/+11
| | | | | | | | | | | | | | Since Windows Vista the resource language must be included to make the version information visible in Windows Explorer. Two new variables have been introduced: RC_LANG (default: 1033) - resource language RC_CODEPAGE (default: 1200) - resource codepage Task-number: QTBUG-23218 Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake vcxproj generator: fix handling of /MANIFEST:NO linker optionJoerg Bornemann2012-04-171-0/+7
| | | | | | | | Task-number: QTBUG-23513 Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: QMakeProject::intValue addedJoerg Bornemann2012-04-171-0/+13
| | | | | | | | | For variables that are supposed to contain a single int, this method returns the numeric value. Only the first value of the variable is taken into account. Change-Id: Ifa11ba5ac044e0a4703a387a9bcf02043e4681d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake vcproj generator: unused variable removedJoerg Bornemann2012-04-171-1/+0
| | | | | Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add QPlatformWindow::windowEvent()Bradley T. Hughes2012-04-175-0/+33
| | | | | | | | | | | This function is used to pass non-spontaneous events from QWindow to QPlatformWindow so that QPlatformWindow subclasses can do any platform specific event handling (such as setting/clearing modality flags on QEvent::WindowBlock/WindowUnblock). Change-Id: I82a89e8dadcd2f706aae25889d79cbfac9c2ee18 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove incorrect inclusion of GL support headers given EGL presenceDonald Carr2012-04-163-4/+13
| | | | | | | | | | The include files have a hard dependency on OpenGL (ES2); testing for the presence of EGL support is insufficient grounds for including this functionality Change-Id: I391b5dbbcbef40ecf68d16617b6eb1c0bb4b799e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make {TCBPoint,QEasingCurveFunction}::operator==() consthjk2012-04-161-3/+3
| | | | | | | | This is needed to use the classes with standard algorithms and is the Right Thing anyway. Change-Id: I13d1e0bfabbd216319cc138f11a9b3240f093052 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Handle window state changes correctly in EGLFSDonald Carr2012-04-162-4/+8
| | | | | | | | The only valid state for EGLFS is fullscreen; this change reduces EGLFS to reflect this cruel reality Change-Id: I5aa9b4ef88451a00ce9de328add7d5512e1c86b5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove insignification from QLocale test for Mac OS X.Jason McDonald2012-04-161-1/+0
| | | | | | | | This test has not failed in the last 500 Continuous Integration runs. Task-number: QTBUG-22769 Change-Id: Ib2e95bb2291757941baa0ea46d568816eef20b09 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Add bug numbers to insignificant_test markers.Jason McDonald2012-04-168-9/+8
| | | | | Change-Id: I4033ef0bd50a1be484503886b6bfda456da26675 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Implemented raster based backing store for EGLFS plugin.Samuel Rødal2012-04-162-2/+138
| | | | | | | This improves quality of rendering for QWidget-based applications a bit. Change-Id: I6b832d1de7e722f4dbe4e82882f5db35f0b8c30c Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fixed networkproxy build under WinCEBjoern Breitmeyer2012-04-162-0/+89
| | | | | | | | | | The used functionality is partially not available under WinCE. qnetworkfunctions_wince.h encapsulates the needed extra symbols. It only needs to compile as the functions are loaded dynamically. Change-Id: Ieb9010d4f6c7f94d39918b869ac503976e094e49 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Introduce fallback for general cross compilationDonald Carr2012-04-161-0/+5
| | | | | | | | | | | | | | | | The current approach of forcing people to pass the fully qualified prefix of their toolchain to the configure script is verbose and something of a chore for people who use the same toolchain to target several devices. This allows you to set a single toolchain for use with all Qt targets via: qmake -set CROSS_COMPILE foo You can still explicitly override this toolchain, as originally mandated, with the configure time device-option arguments. Change-Id: Ibd3d940bb08fa09499533f9c661557e337a8421a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Responses to request with AlwaysNetwork set should be cachedMartin Petersson2012-04-162-8/+2
| | | | | | | | | | | Previously the cache was not enabled if the request had AlwaysNetwork set. This removes the check for the CacheLoadControlAttribute when checking if the cache should be enabled. Task-number: QTBUG-15805 Change-Id: I3d0722fbc1e6c77c5b947a2af0a09e2de8f4f9df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Trivial doc fix.Richard Moore2012-04-161-0/+4
| | | | | | Change-Id: I837c74d38b9f73aed41c3839421f5faad9d22f3f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Minor doc improvements.Richard Moore2012-04-161-0/+9
| | | | | | | Change-Id: Ic14cefcf935fea822c581013f437ae61b820ddd9 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add 'we mean it' header to qpa headersGirish Ramakrishnan2012-04-1618-0/+198
| | | | | | | The QPA api is internal and not meant to be used by app users. Change-Id: I37245e9635bf22f2454e763699dd58eca6565b63 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* doc: Mark all qpa classes as internalGirish Ramakrishnan2012-04-1614-14/+168
| | | | | | | | | | | | All QPA api as marked as so: * preliminary - the api is subject to change anytime * internal - internal api that shouldn't be used by apps * ingroup qpa - "qpa" module. In the long run, qdoc should generate documentation for qplatform* API as if it were a seperate module. Change-Id: I4e76c0e0c1805c679cabd52d5006f9fa9bc411c0 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* gui: Clear the QPixmapCache before destroying the QPlatformIntegrationHolger Hans Peter Freyther2012-04-161-0/+3
| | | | | | | | | | The QPixmap in the pixmap cache should not outlive the QPlatformIntegration. Clear the cache shortly before destroying the platform integration. This is fixing a crash with the DirectFB plugin in the tst_qpixmapcache test. Change-Id: I0b1a304dc37d874b412aadb77f8dbaa7d292711f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove the Qt 5 todo about empty string lists in QSettingsThiago Macieira2012-04-161-2/+0
| | | | | | | | | | | | | There's no need to change behaviour now. The current marker (@Invalid()) returns an empty string list, as opposed to a list with one item. Changing it would break compatibility unpredictably with Qt 4. So I choose not to change QSettings. Let it be "Done". Task-number: QTBUG-25110 Change-Id: Id1f353dfed800005d927183da237f3f8357c496d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Made the evdev mouse plugin clamp coordinates to screen.Samuel Rødal2012-04-162-4/+23
| | | | | | | | Useful when we get relative events, as otherwise the mouse might end up far outside the screen boundaries. Change-Id: I8e3884ab2acb03eaa6afce8926f503dbd03b0c5d Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove OpenKode OpenVG and qvfb platformpluginsJørgen Lind2012-04-1626-2876/+0
| | | | | | Change-Id: Ic0bd8f68080bf139d81266d033cfd3c96a8d01f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Initialize reference count for QWindowsMsaaAccessibleJian Liang2012-04-161-0/+1
| | | | | | | | Initaliize reference count value to 0 for QWindowsMsaaAccessible. Change-Id: I15cadd7ced0240322240060f6dd5126cc8add338 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use the new plugin metadata method in the QNX QPA plugin.Sean Harmer2012-04-164-11/+63
| | | | | | Change-Id: Ib40807b97bf8d9ec26e0dfe2797786d9352ce579 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix finding EGL on QNXThomas McGuire2012-04-161-0/+1
| | | | | | | | | | | | | A recent change in platformsupport required "egl" to be defined, otherwise the QNX plugin would fail at runtime with unresolved symbols. Now the EGL config test passes. Change-Id: I111eb939abac86885bcdb35d5f5899f515bd8c4e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed configure output when no platform plugin is enabled.Samuel Rødal2012-04-161-2/+2
| | | | | | | | | | Instead of having to pass -no-xcb -no-eglfs -no-directfb, it's better to pass -no-qpa-platform-guard which is also resilient against future platform additions. Change-Id: Id68bfe3688980fa273665b01b9332f5d6f359491 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* qmenu.h includes private headersGirish Ramakrishnan2012-04-163-1/+4
| | | | | | | | qpa includes are considered private and should not be included in public header files. Change-Id: I26c744ec1d8ddef7b0c11c3d26b593be05f5aa54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adding support for obtaining an OpenGL Core Profile context on Mac OSXSean Harmer2012-04-161-0/+12
| | | | | | | Change-Id: I08048ecee9b243b122ee93fce316e498aa7e2d51 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix incorrect state of show/hide menu items in Mac application menuPasi Matilainen2012-04-163-0/+13
| | | | | | | | | | | | The "Hide <app>", "Hide Others" and "Show All" menu items in Mac application menu are always enabled, and do not get disabled correctly. Fix by turning on autoenable for the menu in qt_menu.nib, and by implementing menu item validation in QCocoaMenuLoader. Task-number: QTBUG-10705 Change-Id: Ic181dfa26a71acad0067f5269c72517b50b17362 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> (cherry picked from commit 8f23a6be1069455e609e8bea7527726c24bebb36)
* Put bug numbers on same line as insignificant_test markers.Jason McDonald2012-04-169-16/+9
| | | | | | | | This makes it easier to find insignificant tests that have no associated bug report. Change-Id: Ia71d59da062818d3860b0365d063e044705267fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* moc: Fix parsing of the empty preprocessor commandOlivier Goffart2012-04-162-0/+9
| | | | | | | | | | | | When encountering a null preprocessing directive (which is supposed to be ignored), the moc preprocessor will leave a PP_NEWLINE token in the token stream. That will confuse the parser. The PP_NEWLINE token need to be ignored in the preprocessing phase. Task-number: QTBUG-22717 Change-Id: I1e502a7e5bc6fa8ce2f82109ba7199b95747ff0a Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* widgets: Fix painting to a fully transparent top level widgetHolger Hans Peter Freyther2012-04-153-5/+13
| | | | | | | | | | | | | | | | | | | | | | QWS used to have a line to change the composite mode from SourceOver to Source for the top level widget. This wasn't used with QPA and I removed the internal DontSetCompositionMode in qtbase. It turns out that the QWS way is the most efficient one to initialize the background of the widget. The alternative is to have the QPlatformBackingStore::beginPaint always clear the entire to be painted area and then paint the background of the widget. The difference of painting each pixel once or twice is noticable on embedded platforms and in the range of one to two fps. Reproduce the issue with: echo "QWidget {background: transparent}" > style.css ./examples/widgets/wiggly/wiggly -stylesheet style.css Task-number: QTBUG-24526 Change-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Now QSplitter can have 0-pixel handleABBAPOH2012-04-152-5/+5
| | | | | | Change-Id: Iad920ffcd5d7f4c01504d41d1740f130b7aa53dd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* UCD-5.0: apply Corrigendum #6Konstantin Ritt2012-04-154-813/+824
| | | | | | | | | | | | | http://unicode.org/versions/corrigendum6.html: > in Unicode 5.0, the list of characters with the Bidi_Mirrored property > was made consistent for brackets and quotation marks, in preparation for > new constraints on bidi mirroring. However, after publication of > Unicode 5.0.0 it was discovered that this change adversely affected > several quotation mark characters in deployed data. Task-number: QTBUG-25169 Change-Id: Id49caf401af2d5a1e6dbcc32b2f350aa20b7f901 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed broken logic in evdev input plugins.Samuel Rødal2012-04-153-29/+41
| | | | | | | | | If we do multiple reads we need to accumulate the total amount of bytes read, instead of just taking the last read amount into account. Change-Id: Iaa9b90c269f3ed9d09dae67452ca816d9db6217f Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fold qpaintdevice_qpa.cpp into qpaintdevice.cppGirish Ramakrishnan2012-04-153-66/+16
| | | | | Change-Id: I274508826b9be4eb00f67fccae5a18ecbdf41a36 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix header inclusion guardGirish Ramakrishnan2012-04-151-3/+3
| | | | | Change-Id: Icc537d5b52315b9563078da9fa69ddd67b567f76 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix tst_QMdiSubWindow::emittingOfSignals CI failuresGirish Ramakrishnan2012-04-141-4/+3
| | | | | | | | | The test fails consistently on the CI (but never fails on any of the developer machines). This is possibly a timing issue. Change-Id: Ie40d9c38c3128a93898b0e50bfde5a754bd2b7fb Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>