summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix undo and redo in QLineEdit when in password modeJani Honkonen2012-08-223-2/+90
| | | | | | | | | | | | | There are some security issues with undo/redo. User should not be able to get the erased password back in any situation. Therefore redo must be disabled completely and undo is limited only for erasing previously entered text. Backported from Qt5 SHA1: 121062d8848986dcfaf421388a5603b3b48a1e58 Task-number: QTBUG-14226 Change-Id: Ia712f95e8a2e45537a95d48b70686a1a8dd95da2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QListWidget scrolling with keys when there are hidden itemsJani Honkonen2012-08-222-3/+63
| | | | | | | | | | | | | If the selected item is scrolled with keyboard keys the selected item will go outside the visible area. The scrolling did not take hidden items into account when calculating the amout to be scrolled. Backported from Qt5 commit: d4385e48b8566a5587048a3c6d8b2396ba587ed5 Task-number: QTBUG-21804 Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove qurl.cpp from qmake and bootstrap, it's not needed.David Faure2012-08-217-18/+19
| | | | | | | | (and I need this out to be able to use QMutex in QUrl) Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: XFAIL tst_QListWidget::fastScroll() test on WindowsSergio Ahumada2012-08-211-0/+5
| | | | | | | | | The test has one unstable failure so mark it with QEXPECT_FAIL until is fixed. Task-number: QTBUG-26892 Change-Id: If7e647380a99db3145522c780980fe4904c76114 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QFileInfo test on WindowsSergio Ahumada2012-08-211-2/+0
| | | | | | | This test was fixed by b1c46b4b3e322554146aed92cd6035cd9ba43982 Change-Id: I423ea7cb2587c23cc5afe2eac28bed8ba80d67a2 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix deleting of QTreeWidget items.Friedemann Kleint2012-08-201-0/+1
| | | | | | | | | | | | Breakage introduced by af617c319772a34115d0c4d802f25a807cb43065, which caused the autoconnections to no longer work. Task-number: QTBUG-26770 Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)
* Register less types for QtDeclarative/QCoreApplicationKevin Ottens2012-08-203-68/+78
| | | | | | | | | | | | | | | | | | In Qt5 QtQml and QtQuick are separated so you have control on the amount of facilities you need. It is not the case in Qt4 unfortunately so you always pay the price of those registration. To overcome that, this patch avoids quite some of the type registration when we detect we're not running a QApplication. In such case all the GUI related QtQuick 1 runtime is not usable anyway. We keep around only a handful of convenience like Timer, Connection, Component, etc. Change-Id: Idf5aa935795a224ceb5bc66015282fd094b5686c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* test: Re-enabling tst_QListWidget testSergio Ahumada2012-08-171-2/+0
| | | | | | | This test has been passing for some time now. Change-Id: I2ac0eaacab5e9873b691d3d1f5dad3d85ec90485 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QImageReader testSergio Ahumada2012-08-171-2/+0
| | | | | | | This test has been passing in a stable way since build 679. Change-Id: I19dd774793b11604ac0c725cc23adc58fd63cba7 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix tst_qbytearray on QNX/Blackberry systemsRafael Roquetto2012-08-172-4/+2
| | | | | | | | | tst_QByteArray::qUncompress() no longer fails on QNX systems. cherry-picked from qt commit 555e4e05f4f98f524e108fba0fb236406f2e2b2f Change-Id: Ia88204b42f65a94c3f00c4b618255e1870c5a564 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable 3DNOW on Blackberry/Win32Rafael Roquetto2012-08-171-0/+1
| | | | | | | | | | | 3DNow is being incorrectly auto-detected on Windows, causing it to be enabled by default when cross-compiling to Blackberry. In other words, the code line introduced by this patch should have already been there since the beginning, but it got lost somehow. So here it is. Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement QAccessibleLineEdit::characterRect()Jan-Arve Saether2012-08-163-3/+27
| | | | | | | | | It was probably not implemented because it needed to access private APIs. However, accessing those from this a11y plugin is unproblematic. Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Polish Polish translationsJarek Kobus2012-08-162-158/+85
| | | | | Change-Id: I52ae2101dd60881ffb9e5202b8351d8bd192e42a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: Re-enabling tst_qdeclarativeerror testSergio Ahumada2012-08-161-1/+0
| | | | | | | This test is passing now on Windows. Change-Id: I569c32c268406e3909ad418dc1761f85e9388f92 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix error test on Windows.Glenn Watson2012-08-162-1/+2
| | | | | | | | | Add missing .gitattributes file to ensure the test data file is checked out with LF line endings on Windows. Change-Id: I9ece655dbc8657d6e70c58ce1ada06ee021c92ad Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> (cherry picked from commit 587b21cf18bcb689aef58411837ed616b02c952b)
* Fix for restoring dockwidget's size when it gets dragged.Mikko Knuutila2012-08-162-6/+51
| | | | | | | | | When user drags a dockwidget out of the docking area, restore widget's previous floating size and center it's titlebar under the mouse. Task-number: QTBUG-2940 Change-Id: I004de36d649abc4c32420bdd46bb6c810ef98c64 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* rebuild configureOswald Buddenhagen2012-08-151-0/+0
| | | | | | Change-Id: I4dbe8cb9b777b141e9e147277c7a424739d40926 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-1511-31/+65
| | | | | | | | | | | | | | - Support ".." in QCH documentation file paths. This essentially means that we stop using cleanPath, and where needed, prepend the virtual folder name, followed by "/..", in front of the original path. - Remove com.trolltech default DocPath since this was not used anymore. (Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939) Change-Id: I6508529de756bad979356c63bfcf6c55a609e827 Done-with: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* XMLHttpRequest does not support the DELETE methodJani Honkonen2012-08-155-4/+33
| | | | | | | | | | This is a backport from qt5 commit: 0eeb925aa5039ffddf8d623f250980fc4c97712e Task-number: QTBUG-17963 Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* test: Re-enabling tst_QFont testSergio Ahumada2012-08-151-2/+0
| | | | | | | This test has been passing for a long time. Change-Id: I45b5d155979dc2055349906d3dde2caa6900d827 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enable tst_QGraphicsEffect test.Sergio Ahumada2012-08-152-2/+22
| | | | | | | | | | The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26858 Change-Id: I278baa8179f1be83b6d6f620393fcaea92a5bf2f Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-08-153-10/+46
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* license: Fix Blackberry/QNX license headersSergio Ahumada2012-08-1452-218/+103
| | | | | | | | | | | | | These files where skipped when tst_license was enabled a while ago since they had a different license header that didn't match our test. Fix these licenses and stop skipping them in tst_license.cpp Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* test: Re-enabling tst_QTreeView testSergio Ahumada2012-08-141-1/+0
| | | | | | | This test has been passing for a long time. Change-Id: Iebf211aa87bbf1a65910412c2fa2753d7e21b574 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QMenu testSergio Ahumada2012-08-141-2/+0
| | | | | | | This test has been passing for a long time. Change-Id: I75f3ec9d7e44df4e7cdf821aa85efa5e93724ba1 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QNetworkConfiguration testSergio Ahumada2012-08-141-2/+0
| | | | | | | This test has been passing for a long time. Change-Id: Ifb5088dd8e0e8ec3ea03baaf0ccabbffd82e6722 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QNetworkConfigurationManager testSergio Ahumada2012-08-141-2/+0
| | | | | | | This test has been passing for a long time. Change-Id: I570540b907e390bffad5e4afea1f2bc0f7099327 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Bump hex copy of Qt version number to 4.8.3.Jason McDonald2012-08-141-1/+1
| | | | | | | | | | Change-Id: I7bf366fc15aeb86f0d0a19481b81f690feb7af9a Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix dangling pointer access during drag-n-drop operationNick Shaforostoff2012-08-141-1/+1
| | | | | | | | | delay deco widget freeing because the pointer to it is still available to the drag operation. Task-number: QTBUG-19363 Change-Id: I775864f72d7151c9fbd26feff5a9bd844f87f292 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-141-1/+2
| | | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)
* Accessibility: Add missing break;Jan-Arve Saether2012-08-141-0/+1
| | | | | | | Found while porting QAccessibleTextWidget to Qt 5 Change-Id: I6a8f69d859fad20949e8250f03dd18d4106cc31c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add default QPA plugin option to 'configure'Ian Dean2012-08-131-1/+14
| | | | | | | | | | | | | Add option to specify default QPA plugin with -qpa command-line option for 'configure'. This matches the option used for configuring the default platform plugin for Qt5, and is optional (if omitted, no default platform plugin will be set up). This change is back-ported from Qt5 (Change-Id: 0074cc5d) Change-Id: Iec6e29ab14f19dcdde50ca1baa02b61b3ef66979 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* make currentText the USER property for QComboBoxMark Brand2012-08-131-2/+2
| | | | | | | | | | | | | | | | QItemDelegate takes the USER property as the value to be set using model->setData(). The text is what is expected. follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0 broke the interaction between QComboBox and QItemDelegate used by QDataWidgetMapper and item views. Task-number: QTBUG-26501 Cherry-picked from qt5/qtbase 816c5540179362500dfc175b77f05abf3ef25233 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Change-Id: Ie9c228f2aa47f194467419398b37d05d98a70a1b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* test: Re-enabling tst_QWidget_windowSergio Ahumada2012-08-131-2/+0
| | | | | | | This test has been passing for a long time. Change-Id: Ic3ac0c9e5ab266912283e3f89fb06b6b08b777e9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Mark tst_QTimeLine as significant on platforms other than WindowsSergio Ahumada2012-08-101-1/+1
| | | | | | | | This test only fails on Windows at the moment, so enabling it for all the other platforms. Change-Id: I41fe201b94126d7ca82b39f2124f5a9e35109afe Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Mac: Don't crash if language preferences can't be retrieved.Eike Ziller2012-08-101-1/+1
| | | | | | | | | That can happen when e.g. running an application with sudo. Task-number: QTBUG-26547 Change-Id: I4b1d4b71716da4026dfa0f68bad905f0010d0968 (cherry-picked from 67d082223c90912a88f5282af90d8fc05f4a389b in Qt5) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't build qtscript when stdint.h isn't availableKent Hansen2012-08-101-1/+2
| | | | | Change-Id: Iba283c8642b2738e1b333e6734eec4369ce8bac4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't build qtscript when stl isn't availableKent Hansen2012-08-101-1/+7
| | | | | | | Task-number: QTBUG-7813 Change-Id: Ie0873e7fbd1168b11e5881d156a0583d0fa7f859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tests: Re-enable tst_MacNativeEvents test.Sergio Ahumada2012-08-092-3/+5
| | | | | | | | This test is unstable on Mac OS X so marking it with QEXPECT_FAIL and re-enable the test. Change-Id: I8549378db1216de7484feb4080e5e2a1522d2418 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* tests: Re-enable tst_QMdiSubWindow test.Sergio Ahumada2012-08-082-2/+5
| | | | | | | | The test has one unstable failure. Mark this with QEXPECT_FAIL and re-enable the test. Change-Id: I2ccbbae4d5367cd9a24577857ed97247018f140e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: Re-enable tst_QGraphicsProxyWidget test.Sergio Ahumada2012-08-082-2/+6
| | | | | | | | The test has one stable failure. Mark this with QEXPECT_FAIL and re-enable the test. Change-Id: I2e536f1b40a1d36ab593d724ee5f9ce66ce87495 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed qt version to 4.8.3jutaipal2012-08-0819-39/+39
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Properly handle include cyclesKevin Ottens2012-08-081-28/+75
| | | | | | | | | | | | | | | | | | | | | | | Currently lupdate is just issuing a warning when it detects an include cycle. Since it's not a full preprocessor, most of those warnings are false positives, but they need special handling, this patch provides that. Now every result is stored as part of a cycle (so in the general case a cycle of one file). When detecting a cycle, instead instead of issuing a warning, we record the presence of the newly detected cycle for later use and merge the other relevant cycles with it. When retrieving results now it's not for a single file anymore but for a complete cycle at once (which can turn out to be a cycle of one file). This is a backport of the commit done in qttools with revision 3b99677b3376924e347ec4aeb0c363438146bfde Task-number: QTBUG-6587 Change-Id: Idc79fbac4f69478ccff1464c1f4278d4afbf9d61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake vcxproj generator: map TARGET_EXT to $(TargetExt)Joerg Bornemann2012-08-083-2/+12
| | | | | | | | | | Task-number: QTBUG-26782 Cherry-picked from qt5/qtbase commit e81d7fd1e57fe2ce11cbe07636f890973116f7ab Change-Id: I7a93ede18d83d1ecfa74449fc5db76e8b3f6ae99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: un-copy-and-pastify vcxproj generator a bitJoerg Bornemann2012-08-082-60/+70
| | | | | | | | | | Reusing already built strings improves readability and performance. Cherry-picked from qt5/qtbase commit b4ae57c881455d791f4587978423c47b046a9a4e Change-Id: I62554ffb9100af47ffb4978d51444a4cbbea7572 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Avoid crashes when invalidating a proxy model filter.Stephen Kelly2012-08-082-3/+70
| | | | | | | | | | Backport of b84e180263d0da3d1e6967fcf759225a778ea6ea from qtbase. Task-number: QTBUG-26107 Change-Id: I8323b19ce7b641165de21ad9a6e6b05bf4d93b1c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)Kent Hansen2012-08-088-39/+84
| | | | | | | | | | | Cherry-picked from webkit commit a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 Task-number: QTBUG-23871 Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> (cherry picked from commit 79ebd39d0d4846cb911ae122d2059e5add568d7e in qtscript) Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* test: Re-enable tst_Symbols testSergio Ahumada2012-08-082-3/+1
| | | | | | | | Adding '--dynamic' to nm to display dynamic symbols rather than the normal symbols. Change-Id: Ia162cbb6e1290835727f3bf2c4b8702ba22c6fd3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* examples: Add dockwidgets to the list of examplesSergio Ahumada2012-08-061-0/+1
| | | | | | | This example is needed by tst_GuiAppLauncher::run() Change-Id: I4ad828006bb0b801eefc374950f1345fdf2b0f8b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix valgrind errors due to "const char *getSystemLocale"David Faure2012-08-061-1/+1
| | | | | | | | | | qgetenv returns a QByteArray, so casting that to a char* leads to using deleted memory. This was introduced by 25c4ce6deef20c69d00fe1197a60e8b7587c81cb. Change-Id: I27ccad022e327e119fea3c3cdcf9beb541ab9097 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com>
generated by cgit v0.12 at 2024-08-23 15:15:30 (GMT)