summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Symbian building: enable symbian platform autodetectionPasi Pentikainen2012-02-091-3/+0
| | | | | | | | | Enable Symbian platform autodetection to differentiate between platform versions. Change-Id: I9553d181952f011b162232cc8946d0dc0a64d92c Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: Fix for blank window after taping Editing options.Satyam Bandarapu2012-02-092-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens in FlightInfo app when menu is opened, editor lost focus and Fep manager looks for focused editor to do ccpu related tasks. It also has some partially regression from fix a2709ef3f4410a1d1755e00353e6f969f8bb5613. The regression is fixed in QCoeFepInputContext::DocumentLengthForFep by returning size to 1 only for multiline editors with no text and multiple lines presented. And also set focused editor to last focused editor when Menu is opened. Opening EditOptions shows blank window if virtual keyboard is never open before. This is because 'm_lastFocusedEditor' is null and it will set to last focused editor only when virtual keyboard open. Fixed in QCoeFepInputContext::setFocusWidget by setting 'm_lastFocusedEditor' to current editor. Above fixes causes other issue, Qt application 'actions' are never added to optionsMenu. This happens because Qt Symbian implementation assumes that default menu items are less than or equal to one, but in Qt 4.8.0 CCPU adds one more default menu item (EditOptoins) to OptionsMenu in addition to 'Writing language' menu item. Fixed by setting NumberOfItemsInPane<=2 in QS60MainAppUi::DynInitMenuPaneL. Change-Id: Idd35cbc746f06f1c64d003c0a32ef1b8f8bc3c89 Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-0917-22/+22
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fixed null pointer dereference in QUnifiedTimerNick Ratelle2012-02-081-6/+9
| | | | | Change-Id: I8b7ab19a98e2920fc020043088c32d073aa1d60d Reviewed-by: David Faure <david.faure@kdab.com>
* Fix bug in qatomic for INTEGRITY RTOSKalle Viironen2012-02-081-34/+57
| | | | | | | | Fixes errors in INTEGRITY qatomic pointer and int templates and wrongly defined IS_WAIT_FREE's & IS_NATIVE's Change-Id: I1ab0236bb4979c0fda6a075ca82ee618a6da40e1 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix Qt to use font with simplified chinese characters as default if neededMarko Kenttala2012-02-081-0/+8
| | | | | | | | | | | | Qt defaulted to use a font with traditional chinese characters even if system language was set as ELangPrcChinese. Fixed qfont_s60 to use a font with simplified chinese characters in this case. Task-Number: ou1cimx1#915614 Change-Id: I0258a95f6630b4fa07acc9340bb38fc67bea7b1d Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix for effects in Qt-applications startupAri Lehtola2012-02-081-0/+7
| | | | | | | | | | | This is part of the solution for reducing flickering in Qt-applications startup. Fix is effective together with changes in platform effects framework. Task-Number: ou1cimx1#951526 Change-Id: Ia8d0544ec30741605efd6f7db035bcea2f36e67a Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* tests: Don't mark qcopchannel and qdirectpainter subtests as testcases.Sergio Ahumada2012-02-082-3/+0
| | | | | | | | | The subtests are intended to be executed by tst_qcopchannel/tst_qdirectpainter and therefore don't need to have "CONFIG += testcase", which causes 'make check' to treat them as stand-alone tests. Change-Id: I3461275f5e32f1fa8836f17d0e9e6d0780dd81e5 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Prevent crashing on Symbian in case EGL surface creation fails.Pauli Jarvinen2012-02-084-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible in environment with limited resources, that EGL surface creation fails. When this happens, the QPainter doesn't get properly activated, which in turn caused a crash later in the drawing code. Now, a check has been added into qapplication_s60.cpp to abort window drawing immediately, if surface creation has failed. The EGL surface is then tried to be recreated on the next time when the window becomes visible, which usually allows the application to recover. In most cases, the crash happened in the function qDrawBorderPixmap, which didn't check the validity of the QPaintEngine pointer before accessing it. This method is analogous with the public methods of the class QPainter where, on the other hand, availability of QPaintEngine was always checked. To be in line, and to prevent ptential crashes, a similar safety check and warning message have now been added to method qDrawBorderPixmap. Furthermore, a null-check was added to qwindowsurface_gl.cpp for the QGLContext pointer. The same pointer was already previously null-checked in the other branch of the same function, indicating that the null-check is probably necessary. Task-number: ou1cimx1#969923 Change-Id: I6d78be72b9c2308ef74b1119d8c8ec34ec015195 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update accessibility selections in QTextControl.Frederik Gladhorn2012-02-081-2/+13
| | | | | | Change-Id: Iae0c2792b64b8ec2736a9ff621cf7c313a394093 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix access to uninitialized values in QtXmlPatternsSami Rosendahl2012-02-083-29/+14
| | | | | | | | | | | | | | | | | | | | | | | Fixes valgrind warning like below when executing tst_QXmlQuery::copyConstructor() Conditional jump or move depends on uninitialised value(s) at: QPatternist::NodeIndexStorage::operator!=(QPatternist::NodeIndexStorage const&) const (q by: QXmlItem::operator=(QXmlItem const&) (qabstractxmlnodemodel.cpp:1228) Reason for the warning is that QPatternist::NodeIndexStorage::operator!= accesses all fields of NodeIndexStorage, which are all not intialized in every execution path of QXmlItem::QXmlItem(const QVariant &) and class QPatternist::Item constructors. Fixed by adding NodeIndexStorage::reset() function that resets all fields and put a call to that function where NodeIndexStorage objects were previously incompletely initialized. Note that unfortunately class NodeIndexStorage cannot have a default constructor, because it is used as a union field. Change-Id: I686433ba552f025658f7e583226e77346db82159 (cherry picked from commit f42f82f435d738339ad85c1380d1167338517247) (cherry picked from commit 65d2458408ccda1b37e1069fd13791a60fa0c672) Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Some small doc fixes, typos and removal of one incorrect paragraphAndy Shaw2012-02-085-12/+7
| | | | | | | | The QTextStream paragraph that is removed referred to something that is incorrect. This was confirmed for Windows, Linux and Mac. Change-Id: Ibac8f82482f2060308b5b8485d6da228bdf52fe6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Don't get stuck in a loop while trying to close the active popup widgetAndy Shaw2012-02-081-1/+1
| | | | | | | | | | | When the application is deactivated then it will try to close down the active popup widget. However, the popup widget can prevent a close from occuring and Qt should respect this without causing problems when the application is reactivated later on. Task-number: QTBUG-23448 Change-Id: Icc4902cbeac99eb631e569167227d9bcd4d4dcbb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Improved stability of tst_networkselftestRohan McGovern2012-02-081-12/+12
| | | | | | | Significantly increase most timeouts. Change-Id: I3c25692d1e26ae3efd301df2f02089e57a8708d3 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Handling adopted thread death with active timers on SymbianMurray Read2012-02-083-6/+50
| | | | | | | | | | | | | | Timers are thread local objects on Symbian. When the adopted thread monitor tries to tidy up a thread, any existing qt timers will be cleaned up. But that has to be done very carefully without touching the underlying symbian timer objects. Checks are added to make sure the Symbian timers are only touched in the correct thread. Task-number: ou1cimx1#960478 Change-Id: If16750b455aa576aa9f2d93657a3627d18060272 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Changes in Symbian CleanupStack use to allow dodgy app startMurray Read2012-02-082-12/+11
| | | | | | | | | | | | | | Some important apps were found to invoke Qt code using the Symbian CleanupStack during static data initialization. This is not legal Qt code, but due to the importance of maintaining compatability with these apps, Qt has been modified to avoid the problem. In one case by removing unnessary use of CleanupStack. In the other by creating a temporary CleanupStack. Task-number: ou1cimx1#960665 Change-Id: Iff631a638dceec10aa38add88ba93a63a831a574 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Make QString::latin1() re-entrant, the global QHash needs a mutex.David Faure2012-02-083-1/+29
| | | | | | | | | | *Different* instances of QString used in different threads would often lead to crashes due to the global QHash used by latin1() and ascii(). Basic autotest for latin1() added. Change-Id: If4fd450deb28f41b1d71f377cacb8815ddeffbee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ensure the header's context menu is in sync with the visible sectionsAndy Shaw2012-02-071-1/+12
| | | | | | | | | | | When the filedialog was reshown the context menu for the header was not in sync with the sections that were actually visible. This ensures that it is in sync after the state of the header is restored. Task-number: QTBUG-23271 Change-Id: Ia1546bf300d43a5822482f63de99eb52b674bf52 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Ensure that QSqlDatabase::database() is still thread-safeAndy Shaw2012-02-071-4/+1
| | | | | | | | | | | | | | | | QSqlDatabase::database() is documented to be thread-safe and when the driver is queried for the numericalPrecisionPolicy set then it can comprimise the thread-safety. Since the driver itself (if one is set) will be queried for the numericalPrecisionPolicy when numericalPrecisionPolicy() is called on the QSqlDatabase then we can have it fallback to the default instead rather than taking the driver's own setting. Task-number: QTBUG-13423 Change-Id: Ie6a8ed76236a3bb3b8bfdb61ef156699b05a93ab Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fixed CustomDashLine drawing bug.Samuel Rødal2012-02-071-1/+3
| | | | | | | | | | The bug was caused by attempting to stroke an empty subpath. If there have been no line-to's emitted we should not try to join the start and end of that line segment. Task-number: QTBUG-23248 Change-Id: I38b7e955ed6683f8fc25f9551e93b4f472c022bf Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* test: improved stability of tst_qiodevice on slow machinesRohan McGovern2012-02-071-4/+4
| | | | | | | | | | | Increased network timeout from 5 to 30 seconds. Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0 Reviewed-on: http://codereview.qt.nokia.com/2456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> (cherry picked from commit 493634a71190679666082687626c05047b5cd463) Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix height of some Thai charactersMarko Kenttala2012-02-071-0/+28
| | | | | | | | | | | | | | Some Thai characters with two above glyphs were higher than fonts ascent. This caused them to be clipped in for example qtcomponents buttons. Added checking for this and calculation of new lower offset between glyphs if needed. Task-Number: ou1cimx1#898104 Change-Id: I6eff058cbe5fe92a01ac1ad10ee351fe8ed78e67 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Improved stability of tst_qsemaphore (especially on mac)Rohan McGovern2012-02-071-14/+26
| | | | | | | | | | | | | | | | Timers are not entirely precise; if we ask for a timeout of 10000 milliseconds, we might time out in 9999 instead. Also, we know the expected elapsed time in each case, so do a fuzzy comparison against that time. Previously the test was verifying that the elapsed time was greater than or equal to the timeout in the case where a timeout was expected, which means the test would not detect bugs which incorrectly caused the timeout to occur later than it should. Change-Id: Ic054013c7d53af8a87a89e9d9c4acbce68ba575e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improved stability of tst_qhttpsocketengineRohan McGovern2012-02-071-7/+7
| | | | | | | | | | | | This autotest assumed that various network operations could always be completed within 5 seconds. Notably, it assumed that an attempt to resolve a nonexistent hostname would always result in an error within 5 seconds. In my testing, it usually takes 4-6 seconds to complete, but occasionally takes as much as 13 seconds. Change-Id: Ia31bb86495928633159f3527763aad086635e7e4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2012-02-074-1/+6
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Ie3afe664e3a91c2d1f9ca03c2f39f8f9c5aa6edc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed CeTest remotelib build for WinCE 5.jaanttil2012-02-071-1/+1
| | | | | | | | | | WinCE 5 does not have PPN_POWERBUTTONPRESSED but PPN_SUSPENDKEYPRESSED. Newer WinCE version have both, but PPN_POWERBUTTONPRESSED is defined to same as PPN_SUSPENKEYPRESSED, that's why it is safe to use PPN_SUSPENKEYPRESSED in all WinCE versions. Change-Id: Ida0604f86330c3e833a1ad41a88db55aa6a625fa Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed Qt examples building when QT_NO_GESTURES is used.jaanttil2012-02-071-0/+2
| | | | | | | | | | Gesture examples were always enabled regardless the used Qt configuration. Added check for QT_NO_GESTURES to examples.pro, and included gestures examples only when needed. Change-Id: Ic8789aedb1251a3827191c647d4b0c4d5a1b6306 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use available geometry when maximized.Rafael Roquetto2012-02-071-1/+9
| | | | | | | | | | | | | | | Use the available geometry as a maximized window would fit on the desktop in the available area (some space is used up by task bar, system menu, etc.) as opposed to the fullscreen geometry which would be the entire screen. cherry-picked from qt5/qtbase: c051d3350e4f227f71921e7db7e52d02525cc8fc Change-Id: Id20fdf68bcbd2eb1fc7db5cf1658bbefbe5737a4 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixes QIconvCodec::convertToUnicode()Nick Ratelle2012-02-072-1/+6
| | | | | | | | | | | | We need to hang onto the internal state of the utf16 converter object whenever converting a long string to unicode. This was failing with the text stream class -- the first read was okay, but subsequent reads could not be correctly converted to unicode. cherry-picked from qt5/qtbase: 72c07311228ce6eefb460d7e5da3de24220ba81e Change-Id: I794d78808ccd9deedcb406bfe46e373c18142d05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unnecessary codeblock.Casper van Donderen2012-02-071-9/+0
| | | | | | | Fixes: QTBUG-24082 Change-Id: I000e397983d3f26b49ffc9cc61f0d4e20583e6ee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2012-02-071-0/+2
| | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fixed qmldbg_inspector build for WEC7.jaanttil2012-02-062-0/+9
| | | | | | | | | | WEC7 does not have std::floor, define it in qfunctions_wince.h and include qfunctions_wince.h to qmldbg_inspector in WinCE environments. Task-number: QTBUG-22510 Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Exclude helloconcurrent when QtConcurrent is not configuredSamuli Piippo2012-02-061-1/+1
| | | | | | | Task-number: QTBUG-23874 cherry-picked from qtbase c8156cab81690526adffa22214657fc1c6563b8b Change-Id: I371a3eb3f4145d80e9f51fe89d61bac5c269d587 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-062-0/+4
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* JSCore build fix for WEC7jaanttil2012-02-061-0/+11
| | | | | | | | | | WEC7 does not have std::ptrdiff_t type and std::min/std::max, introduced the missing types and functions in JSCore platform.h Task-number: QTBUG-22497 Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixes to JSCore for WinCE.jaanttil2012-02-061-9/+9
| | | | | | | | | | Moved WINCE specific code before desktop windows code. This is needed because in WinCE both OS(WINCE) and OS(WINDOWS) are true. Task-number: QTBUG-22502 Change-Id: Icf9ad1a155dc705e37e5e057bb23bc7f5c2d4931 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixed QtDeclarative autotest deployment for WinCE devices.jaanttil2012-02-0661-61/+134
| | | | | | Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed cetest build for Windows CE.jaanttil2012-02-061-1/+3
| | | | | | | | | | | | The bootstrap configuration for cetest was missing a few dependencies which broke the build. Added the missing dependencies to cetest bootstrapped.pri. Task-number: QTBUG-22505 Change-Id: Ibf966f9855f7eb8a7e561ea570c17ff447aa057d Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix 3 autotest build faulures for WinCEjaanttil2012-02-063-1/+4
| | | | | | | Change-Id: I67af7b1b31be3c6d99abf2344bcfd93fd5f77bf6 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix for QtDeclarative in WindowsCEjaanttil2012-02-061-0/+7
| | | | | | | | | | | | | | | | | | | qdeclarativestateoperations.cpp in declarative module needs to include qgraphicsitem.h. In windows CE, the qgraphicsitem.h further needs to include qfunctions_wince.h. qfunctions_wince.h is used to implement posix functions missing from WinCE. One of reimplemented functions in qfunctions_wince.h is posix rewind. Now qdeclarativestateoperations.cpp also implements method called rewind with different prototype. Two incompatible prototypes of rewind break the QtDeclarative build for WinCE. As a workaround the POSIX rewind reimplemented by qfunctions_wince.h is now undefined in this class, because it is not needed here. Task-number: QTBUG-22511 Change-Id: I9e569fa753e70b386068f54d95c3aae0a2dbe55d Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Ensure that the type is not registered as a typedefAndy Shaw2012-02-061-1/+1
| | | | | | | | | | | | When qRegisterMetaType() is given a dummy parameter as 0 then it will try to register it as a typedef and not a type. Changing it to be -1 for the dummy parameter will ensure that it is not registered as a typedef. Task-number: QTBUG-18555 Change-Id: I18606bb1e53a334256658cc5b8d8a13c0d6617a1 Reviewed-by: Martin Petersson Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Make copy and cut methods work in QAccessibleTextEditJosé Millán Soto2012-02-062-3/+16
| | | | | | | | Correct the implementation of cutText and copyText in QAccessibleTextEdit so they use cut() and copy() methods of QTextEdit Change-Id: I86a531ed7059b1a928cb8515c2743d4d8b596b36 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Do not check isActiveWindow to determine if an accessible widget is focusableJosé Millán Soto2012-02-062-3/+3
| | | | | | | | | QWidget::isActiveWindow() was being checked in QAccessibleWidget::state to determine if a widget is focusable. As a result, focusable widgets were reported to be not focusable when the window was not active. Change-Id: I765eddca859d859d19d31bd2e9ffe3b132a1a4ef Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add support for QNX iconv implementation.Rafael Roquetto2012-02-034-3/+9
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: fix tst_QFile::rename() autotestSergio Ahumada2012-02-031-1/+1
| | | | | | | | | This test was incorrectly assuming that a file named "Makefile" exists. Change-Id: I318b12f67e0476d6f08d1fc86194ca96f2bdb373 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from commit 227cb8c0b91f9e88e53432b3936cd1fc4f90e9f7) Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fixed DEBUG macro redefinition when compiling for WEC7 with MSVC.jaanttil2012-02-031-11/+11
| | | | | | | | | | DEBUG macro is defined from command line for debug builds in WEC7. Changed graphcisscene internal macro to have different name. Task-number: QTBUG-22512 Change-Id: I3d2bb8b7a2741fe34397a1c3cc268c1f6c5593b3 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed compiler warning about unused status argument.jaanttil2012-02-031-0/+1
| | | | | | | | | Task-number: QTBUG-22512 Change-Id: I6894259faa3af6171a3f5313357d222e45b48af3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed warning by MSVC about class/struct mismatch in MethodData.Janne Anttila2012-02-031-1/+1
| | | | | | | | | | | MSVC reported the following warning when compiling declarative module: 'MethodData' : type name first seen using 'class' now seen using 'struct' Fixed by changing the forward declaration from class to struct. Task-number: QTBUG-22512 Change-Id: I066feea80115d1d968332933d78e0408cd92a70a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-038-2/+13
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed qchar and qsvgrenderer autotest deployment for WinCE devices.jaanttil2012-02-032-2/+7
| | | | | | Change-Id: Ibac9f5878ea1ec2a7d13868e5e60f1d6e7aa3d36 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>