summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* tests: Re-enable QTextScriptEngine test.Sergio Ahumada2012-08-062-2/+10
| | | | | | | | | The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26495 Change-Id: I9897c4008bd925402f18af87988feedcdd729062 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: Re-enable QAccessibility test.Sergio Ahumada2012-08-032-2/+12
| | | | | | | | | The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26499 Change-Id: I3774405f736609a4c262d2d44c5ffcceec1a0a09 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Check that property descriptor members are valid before using themKent Hansen2012-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | Even if getPropertyDescriptor() returns true, it's not guaranteed that PropertyDescriptor::setter() or PropertyDescriptor::value() returns a valid JSC value. This code is in an "#ifdef QT_BUILD_SCRIPT_LIB" block, i.e. a patch we added on top of the original JSC sources. The lack of checks caused the getter-in-prototype and indexed-accessors tests from the V8 test suite to assert in debug mode. Cherry-picked from qt5/qtscript commit db17c14cace450e20745839014075c0263f8618f Task-number: QTBUG-17915 Change-Id: I55db26cfe4b63363be92a0b75f2c69b878ea9ef3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Don't crash if queued signal handler no longer existsKent Hansen2012-08-032-1/+40
| | | | | | | | | Cherry-picked from qt5/script commit c89315da2e836fe67c4228cfb73c25a68b0a3a95 Task-number: QTBUG-26261 Change-Id: I24544e2f8c36eaf19c65d9a30affd1f3e05b52bb Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix crash when converting invalid JSValue to stringKent Hansen2012-08-032-0/+11
| | | | | | | | | | | JSC::JSValue::toString() expects that the input is valid. Cherry-picked from qt5/qtscript commit b2969c97fd808e229ff57949dbb9c683f3830b71 Task-number: QTBUG-21896 Change-Id: I534642154ffa4ae400a2ab8e5ce1f0c35899ae6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Stop allowing the old-style Contact: line in license headersSergio Ahumada2012-08-021-7/+1
| | | | | | | | | | | The following line should be used instead ## Contact: http://www.qt-project.org/ Change-Id: I75479b017a76872640043920811066d4a0605a10 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: Re-enable tst_Headers test.Sergio Ahumada2012-08-022-2/+6
| | | | | | | | The test had one stable failure which should be fixed by adding missing QT_MODULE and QT_BEGIN_NAMESPACE macros Change-Id: I10801e4c495bee66e1937a57d14019dae8b43a9d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix crash when accessing QObject properties through activation objectKent Hansen2012-08-022-0/+22
| | | | | | | | | | | | | | | | | | | Since objects in the scope chain have to be JSActivationObjects, QScriptContext::setActivationObject() creates a proxy object that should delegate access to the actual object. This case was not handled in the toQObject() conversion function, so for activation property access through evaluation (where the this-object would be the proxy object, not the actual QObject), the this-object conversion to QObject would fail, and the assert "this-object must be a QObject" was triggered. Cherry-picked from qt5/qtscript commit 44062ea8e2499f8d2061c7e5be8fb754f2ba4310 Task-number: QTBUG-21760 Change-Id: I284b70ea5c9af3a15dadd4243283afe0d00bcd5a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update Czech translationPavel Fric2012-08-013-399/+566
| | | | | | Change-Id: I27320a1a1553fa9f36e00c9395ff2fad2c40cb03 Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adding missing QT_BEGIN_HEADER/QT_END_HEADERSergio Ahumada2012-08-011-1/+5
| | | | | | Change-Id: I1144497ec8376ec41c714b7a55c05637b6feee66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from commit 0e904279bd14c6d3d32165ff93d22d96e7ff6fd7)
* Update contact information in license headers.Sergio Ahumada2012-08-0111585-23285/+23316
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: Re-enable tst_QMdiArea test.Sergio Ahumada2012-08-012-1/+4
| | | | | | | | | The test has one stable failure. Mark this with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26726 Change-Id: I7b59609f71d35af27b56f62eedc9bbef4adb7f65 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* [Blackberry] Set default platform name for QPARafael Roquetto2012-07-302-0/+4
| | | | | | | | | | | Set the default platform name/plugin to be 'blackberry' when building for BlackBerry devices. qtbase ref: 5430d1de Change-Id: Id2b3263fd9e1b2214751c3c4d75b8991599926e5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add defaults for Blackberry platform on configureRafael Roquetto2012-07-301-0/+25
| | | | | | | Adds default values for Blackbery platform configuration on configure.exe. Change-Id: I11e4f7135d88fcc6133194d6a82863ae494c8c82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Accessibility: fix updates for models with rootIndex set.Frederik Gladhorn2012-07-301-6/+12
| | | | | | | | | The accessible table/list implementation would ignore when a root index is set, resulting in trying to use row/column for the top level index, leading to accessing invalid indexes. Change-Id: I2568522053bafe48458446dd2f47b68d98d634aa Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40Simon Hausmann2012-07-305-2/+11
| | | | | | | | | Prospective build fix for Mac OS X Mountain Lion Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be Reviewed-by: Mike McQuaid <mike@mikemcquaid.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Check for 0 before accessing the pointerLars Knoll2012-07-301-0/+3
| | | | | | | | | | | | Fixes some reported crashes where we get into qt_tokenize() with a 0 pointer. Not relevant for Qt 5, as qt_tokenize() doesn't exist there. Task-number: QTBUG-26247 Change-Id: I1cc5c5b514c1c35dfee318ad4d37a54deffc5d53 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Workaround tst_headers, especially the license header checkSergio Ahumada2012-07-301-11/+37
| | | | | | | | | This is a temporary solution to enable the license header test. All license headers need to be converted following Qt5 Change-Id: Ic96c0fd783aedc4aa4fefaa4eb816e75cd07f742 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix duplicate mouse event being sent for LinuxInput touch eventsRomain Pokrzywka2012-07-291-1/+1
| | | | | | | | | | | | | | This is due to the X and Y messages being received before the TOUCH one, followed by a SYNC message which then creates the second mouseEvent. The event should actually be sent on the SYNC message, so remove the one sent from the TOUCH message handler, just set the posChanged flag. For more details see: http://www.kernel.org/doc/Documentation/input/event-codes.txt Change-Id: I30e71fc3e7da24d8e698467b4d6e0bcd5a64eb37 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QUrl: document that setIdnWhitelist isn't thread-safeMarc Mutz2012-07-281-0/+3
| | | | | Change-Id: Ia77a211f1d670d81b2a4783693ed09533d53eceb Reviewed-by: David Faure <faure@kde.org>
* Use improved QLibrary search heuristics for SSLSean Harmer2012-07-271-0/+2
| | | | | Change-Id: I3b6b4beedae4323cce5130fd2fcaf2a25c5be5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v0.12 at 2024-11-12 14:40:08 (GMT)