summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set macosx-version-min in common Mac OS X mkspec instead of configureTor Arne Vestbø2012-01-233-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | When set in configure it would be written to .qmake.cache and would only apply when building Qt. We then had an override (that was also out of sync, version-wise) in the g++ mkspec, which would also apply to apps building agains Qt. This override did howerver not apply when using the Clang mkspec. We now move setting macosx-version-min to the common macx mkspec, shared by both g++ and Clang, which will apply both when building Qt and when building something against Qt. The latter since an application built against Qt will not deploy on versions of Mac OS earlier than 10.6 anyways, so we might as well always set the minimum-version. The modifications to the mkspecs will result in macosx-version-min being passed twice when compiling qmake, as configure writes its own makefiles and the mkspec parsing in configure has a bug where it will lazily evaluate qmake-variables instead of evaluating them inline. This is not a problem, and can be fixed in a later patch if seen fit. Change-Id: Ib29503ad00a9dc00e0a50b0dbd9459e89a20dfbd Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Ignore known tst_QStyleSheetStyle failures on Mac OS XBradley T. Hughes2012-01-231-0/+10
| | | | | | Task-number: QTBUG-23686 Change-Id: I566f3b3491576325389862bac2ad7c8526dd930b Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Ignore tst_QStyleSheetStyle::hoverColors() failures on Mac OS XBradley T. Hughes2012-01-231-0/+9
| | | | | | | | | Qt::WA_UnderMouse is not working at the moment, causing this test to fail. Task-number: QTBUG-23685 Change-Id: If167311b09ba8fc3d04d056590588b595825c443 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Ignore tst_QSizeGrip failures on Mac OS XBradley T. Hughes2012-01-231-1/+1
| | | | | | | | This test currently fails on Mac, mark it as insignificant. Task-number: QTBUG-23681 Change-Id: I7355cda953966778d651fafaff837f1083eeb3f4 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip tst_QMenu::QTBUG_10735_crashWithDialog() on Mac OS XBradley T. Hughes2012-01-231-0/+4
| | | | | | | | This test currently hangs, preventing the autotest from finishing. Task-number: QTBUG-23677 Change-Id: I3c5f56c10735d65fb35de4e22a1e2e6414532309 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Ignore tst_QMenu::keyboardNavigaction() failure on Mac OS XBradley T. Hughes2012-01-231-0/+7
| | | | | | | | | | The shortcut0 test data fails, indicating that keyboard navigation via shortcuts doesn't work on Mac OS X for the time being. Mark the failure as expected. Task-number: QTBUG-23684 Change-Id: I199222a87c09e6f491e5dcd21c9f65c28ecbb86d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip tst_QPushButton::sizeHint() with Mac style on Mac OS XBradley T. Hughes2012-01-231-0/+5
| | | | | | | | QStyleFactory cannot create the Mac style, so skip the test for now. Task-number: QTBUG-23680 Change-Id: I2ae61aab152cd8a4e6a7270902df40dd3cc6df3b Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Mark tst_QDateTimeEdit with insignificant_test on Mac OS XBradley T. Hughes2012-01-231-3/+1
| | | | | | | | This tests has numerous failures on Mac OS X, ignore the test for now. Task-number: QTBUG-23674 Change-Id: I29bcfd379a6a13f9859e96c5cc6dc7e932feaf4a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Mark tst_QComboBox::hide() with QEXPECT_FAIL() on Mac OS XBradley T. Hughes2012-01-231-0/+3
| | | | | | | Task-number: QTBUG-23678 Change-Id: I6ced2aa9392f2688ee982113addef7fffcf4b9f2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Ignore tst_QAbstractSlider failures on Mac OS XBradley T. Hughes2012-01-231-0/+16
| | | | | | | | Mark current failures as expected. Task-number: QTBUG-23679 Change-Id: Ic574dbb0fea3a21ef9963ef16bdf85da4c809036 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Use QObject pointer as QCocoaAccessibleElement id.Morten Johan Sorvig2012-01-233-23/+14
| | | | | | | | | | | | | | | Each QCocoaAccessibleElement needs to provide a unique stable id through the -(NSUnterger)hash method. The previous approach of basing the hash on the parent hash plus the child index is unpractical now that childAt() can return distant descendants instead of immediate children only. Use the QObject pointer, which is set for all accessible interfaces today. Change-Id: I5868e3a81c1b4da7233504f30003ab8060e9fa3f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix synthesizing mouse events when touches change orderingLaszlo Agocs2012-01-233-8/+47
| | | | | | | | | | | | | | There is no guarantee the touches will be listed in the same order in an update: the platform/generic plug-in, the drivers, etc. are all free to shuffle the list of touch points in each report (even though the order is fairly stable with most systems). Therefore, to be safe, move and release events should be generated not from the first point in the list but from the one with the matching id. Change-Id: I6615224cbf2cfdc440143eb3191482a23d85c6a4 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Revert "Blow up earlier when adding test rows without columns."Robin Burchell2012-01-231-1/+0
| | | | | | | | | | | | This seems to break a number of tests using the qmltest library. Functionality will be restored in a future commit, once the breakage has been identified. This reverts commit fdedb49b76b8f9ad69611fbfea6b8371ae1ec3a1. Task-number: QTBUG-23845 Change-Id: I0ca4dbd54132e4250702f06738edbad5e8fc4f36 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QPropertyAnimation::setTargetObject() fails if new and old target object ↵Armin Berres2012-01-231-1/+1
| | | | | | | | | | | | | | | | | | | have the same address If a target object is destroyed QPropertyAnimationPrivate::targetValue reflects this while QPropertyAnimationPrivate::target stays unchanged. QPropertyAnimation::setTargetObject() checks if a new target matches QPropertyAnimationPrivate::target - to bad if the former target has been destroyed in the meanwhile but the new one has the same memory address. targetValue is not updated in this case. It will still point to null and QPropertyAnimation::targetObject() returns 0. This is not just a theoretical problem - we stubled upon this in Harmattan when suddenly animations complained that they are having no target. Change-Id: Ib4a9c234d04d6f8a3f7aed251d5e79471d95168a Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* directfb: Deal with Qt trying to create a QSize(0, 0) platfom windowHolger Hans Peter Freyther2012-01-231-3/+3
| | | | | | | | | | | | | | Qt will attempt to create a platform window with the above size and DirectFB will fail to create the window. Make sure the width/height is at least 1 before handing it to DirectFB. According to Samuel it is legitimate to create a QPlatformWindow with QSize(0, 0) and it is the job of the platform plugin to make it work. Follow the approach of the XCB plugin and increase the size. Change-Id: Ifc92780b46f1a73123945988d06bd21a3deb6bb0 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove uses of qMalloc/qFree from out of line code.Robin Burchell2012-01-231-4/+4
| | | | | | | | There is no need to use these, and we are trying to deprecate them. Change-Id: I70e6f27aca322fe74c31d8ad8496f230cd29e503 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed qtmodule-configtests on Windows.Friedemann Kleint2012-01-231-32/+72
| | | | | | | | | | | | | | open() to "|-" and "-|" are unsupported on Windows (see `perldoc perlport'), so don't do that. Let the tests write a 'config.log' file which contains the output of the test commands. Brings back the part fixing the pipe logic from commit f865dc1ae44c88f6965acd09bafb01829c35447b which was reverted. Change-Id: I5060a0885702d925001b98f2d4e84743d6ff226e Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Windows: Implement native event filters.Friedemann Kleint2012-01-233-8/+54
| | | | | Change-Id: Ibdf556428e4dbb9156c87504b923ec9600bcf871 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* XCB: Introduce enumeration for event filter types.Friedemann Kleint2012-01-233-10/+25
| | | | | | | | Remove QByteArray-construction and hash lookup in the event handling; use an enumeration indexing an array instead. Change-Id: I4d272b32a5ff71c8da58197cf3a0b38c1e61d489 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Mark QTriangulatingStroker as Q_GUI_EXPORTAlex Wilson2012-01-231-1/+1
| | | | | Change-Id: I6083ba122c33769cd4626f2c4a32959e535da8a4 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* qfilesystemengine_win.cpp: compile with namespaced QtJoerg Bornemann2012-01-231-7/+6
| | | | | | | | SidCleanup struct must not be in the INCLUDE_NAMESPACE. Change-Id: Ic51f1734af583c0ba7f715f7b27f314211e698c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* xcb: Correctly check the X11 connectionUli Schlachter2012-01-231-1/+1
| | | | | | | | | | | | | Commit e08453f31ae2a195f86a763f0b1c5e617df0e1ce added a check which makes sure qt prints an error message instead of segfaulting when it can't connect to the X11 server. However, libxcb will never return NULL from xcb_connect() and thus that commit only works if XCB_USE_XLIB is defined and used. Change-Id: I8cc1496494a94f07055a3ac5093ce362dd347c5b Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove Symbian specific code from QtXml.Xizhi Zhu2012-01-232-7/+0
| | | | | Change-Id: I29979c80e401f5d6c2c2b38c4e502340f2025a12 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian specific code from QtSql.Xizhi Zhu2012-01-236-76/+0
| | | | | Change-Id: I3fc538862c7334914ec9e4331ef2d3db5c699ea9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* xcb: Don't crash on missing mouse pointerUli Schlachter2012-01-231-4/+6
| | | | | | | | | | | | | | | | | | | The draganddrop examples all crashed here because they were using a default-constructed QImage() (i.e. one without any content). I guess this happens here because I don't have any mouse theme set. To test, one could start a second X server, but without any WM or DE. The "evil" QImage() came from QGuiApplicationPrivate::getPixmapCursor(). This function seems to just always "return QPixmap();". This fix is correct because the only caller has another fallback if the createNonStandardCursor()-fallback didn't work. This caller is QXcbCursor::createFontCursor(). Change-Id: I7ec7fbcfdf0203e983149b5e73016cc7e85ecf40 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove dead code.Richard Moore2012-01-231-19/+0
| | | | | | | | Task-number: QTBUG-23524 Change-Id: I6a80af450b599022e9242cccec945887b871f2b0 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove invalid comment.Richard Moore2012-01-231-2/+1
| | | | | | | | | | No point in making this protected: it breaks existing code including the unit tests, and the base class has this method as public. Task-number: QTBUG-23524 Change-Id: I8fae019088fc368213ff7caa4b19fe7ab60488dd Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Expect tst_QWizard::setPixmap() failure on Mac OS XBradley T. Hughes2012-01-231-4/+10
| | | | | | | Task-number: QTBUG-23701 Change-Id: Iba5b926e57c1565856d17bbfbff4d1da75645ad4 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Expect tst_QFileDilaog:clearLineEdit() failure on Mac OS XBradley T. Hughes2012-01-231-0/+3
| | | | | | | Task-number: QTBUG-23703 Change-Id: I981de80d6946d3637c493bede0adb1b90a539261 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Do not expect tst_QFileDialog::selectFiles() failure on Mac OS XBradley T. Hughes2012-01-231-2/+2
| | | | | | | | | | This test no longer fails: XPASS : tst_QFiledialog::selectFiles() '!listView->selectionModel()- Loc: [tst_qfiledialog.cpp(915)] Change-Id: Ib790c0f81b3d383117cceceaacbf0c3d6a673404 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Do not mark tst_QGraphicsWidget as insignificant anymoreBradley T. Hughes2012-01-231-1/+0
| | | | | | | Allow new failures in this test to block CI. Change-Id: I1c7e797740be2f77f82d00943f6f2018b686481f Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Expect tst_QGraphicsWidget::updateFocusChain...() failure on Mac OS XBradley T. Hughes2012-01-231-0/+3
| | | | | | | | | tst_QGraphicsWidget::updateFocusChainWhenChildDie() currently fails due to what appears to be window activation. Task-number: QTBUG-23699 Change-Id: I404f90d32dba64d558598d97cf805b6c025e6456 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix XPASS in tst_QGraphicsWidget on Mac OS XBradley T. Hughes2012-01-231-1/+3
| | | | | | | | | | | | Don't expect failure from these 2 tests anymore: XPASS : tst_QGraphicsWidget::initStyleOption(all) COMPARE() Loc: [tst_qgraphicswidget.cpp(1162)] XPASS : tst_QGraphicsWidget::initialShow2() COMPARE() Loc: [tst_qgraphicswidget.cpp(3196)] Change-Id: Ibd1178f8cab480fa9fad9c829083a4862749c60b Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix XPASS in tst_QGraphicsView on Mac OS XBradley T. Hughes2012-01-231-3/+2
| | | | | | | | These tests now fail with XPASS on Mac OS X, so remove/skip the QEXPECTED_FAIL(). Unfortunately we don't know which commit fixed this. Change-Id: Id919a2c9d56fd7c4dee8ccb8aa3293efdce603b2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Expect tst_QGraphicsProxyWidget::updateAndDelete() failure on Mac OS XBradley T. Hughes2012-01-231-0/+3
| | | | | | | Task-number: QTBUG-23700 Change-Id: Ic472cea966761afc1e6e17479588b8b53ec4786c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC in tests/auto/widgetsBradley T. Hughes2012-01-2342-211/+195
| | | | | | | | tst_qwidget.cpp will not build/link without tst_qwidget_mac_helpers.mm, so re-add it to the build as well. Change-Id: I55130f62c215c4b82683d90456e31fdb09f833a8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Blow up earlier when adding test rows without columns.Robin Burchell2012-01-231-0/+1
| | | | | | | | | | | | | Previously, the assertation triggered was rather unhelpful: QFATAL : tst_QHash::qhash_qt4() ASSERT: "d->dataCount < d->parent->elementCount()" in file qtestdata.cpp, line 88" We now try a bit harder to be user-friendly. Change-Id: I2e3a5ae27914d44fc1dc89af2a084e3d798fe221 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-237-10/+6
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Id689fdb78727abafba033bed7b0402e2cf27aba1 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-235475-5479/+5479
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Mark tst_qhostinfo as insignificant on Linux.Rohan McGovern2012-01-231-0/+2
| | | | | | | | | | This test sometimes gives different results on consecutive runs, and is therefore insignificant for the purpose of regression detection. Task-number: QTBUG-23837 Change-Id: I8747972c5cb7952089c54cbd22e1660db551e2f5 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove dependency of QtDBus onto QtXmlHarald Fernengel2012-01-229-412/+292
| | | | | | | | | Replace the QDom based code in qdbusxmlparser with code using QXmlStreamReader. Task-number: QTBUG-20856 Change-Id: I294e3ebd6faa813c20806be3ae225ac00befb622 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Obsolete QInputDialog::getInteger() 'officially'.Robin Burchell2012-01-224-42/+22
| | | | | | | | | It has long since been obsolete in code and removed from the documentation, but was never marked QT_DEPRECATED. Do so, and inline the implementation. Change-Id: Ic7bfdaf76269b7f9addeba83e64bc9525c581dda Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update the documentation for bearer.Xizhi Zhu2012-01-221-7/+4
| | | | | | | | | Removed the reference to Symbian plugin, and added the reference to ConnMan / oFono plugin. Change-Id: I6a2ea9159aaa05bf4109bae97889d126a324ef8b Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Alex <alex.blasche@nokia.com>
* Merge overloads of QInputDialog::getText() and QInputDialog::getItem()Robin Burchell2012-01-212-39/+1
| | | | | Change-Id: Ifaefaa5c3faa698c8570da4ef00e130c211b2609 Reviewed-by: Richard J. Moore <rich@kde.org>
* Merge overloads of QFontDialog::getFont().Robin Burchell2012-01-212-23/+2
| | | | | | | | Per Qt 5 comment. Note that this leaves one overload of getFont() intact, as removing it would be a source-incompatible change. Change-Id: Ieb6ddfef9aa86750c14928ab2e0a9bfb84d322ab Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Remove note about source-incompatible change.Robin Burchell2012-01-211-1/+0
| | | | | | | | There's no real gain to be had from doing this. Change-Id: Ifa5fefe4a354cfe1f9a8a915a7041d0cfebccce1 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove copy of libgq.Robin Burchell2012-01-2126-2830/+0
| | | | | | | | | | Nothing in the source tree uses this after the removal of the icd bearer plugin in 0e0eb207c4ada7a09c980b816dda1c5c6af1c027, so there is no point keeping it around anymore. Change-Id: I6ea05c84d561965636e2ca5b03c7ee8edc48c093 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove unnecessary sizehint overload.Robin Burchell2012-01-212-11/+0
| | | | | | Change-Id: Id6b3e206d59df25f6252da48ac99265226313635 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org>
* Change QMessageBox::question to default to yes/no buttons instead of okThorbjørn Lund Martsum2012-01-212-3/+8
| | | | | | | | | Beside that it also removes a suggestion about making Ok==Yes and No==Cancel. It would be a problem since we (at least) can have messageboxes with both yes, no and cancel. Change-Id: I567979b2e697e7103968d6512fe4835f86888ca3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Introduce a qalgorithms benchmark.Robin Burchell2012-01-214-1/+147
| | | | | | | | Based on the unit test for data production. Change-Id: I88a411c0079b251d3682c3fbf9fe7ed1b5457a7e Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org> Reviewed-by: Richard J. Moore <rich@kde.org>