summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Using samples=0 to turn multisampling offmread2012-01-132-2/+2
| | | | | | | | | | | Change 54613aec was using the value 1 for QGLFormat::samples when it wanted multisampling off. But this was actually resulting in multisampling being turned on. It should have been using 0, which it now does. Task-number: ou1cimx1#951223 Change-Id: Ie68367f083f7ab4bae4143a59996c71add3e5c06 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix for player application exit crashSatyam Bandarapu2012-01-134-2/+14
| | | | | | | | | | | | | | | | Crash is a regression from the commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6. The commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6 creates two fep contexts, another one is created while first one being created. When application exit, other fep context is deleted after coeEnv destroyed. Fep context destructor uses method from coeEnv and when second fep Context deleted application crashes. To fix the crash, flaged fep context creation while being created. Change-Id: I3079179df2c3a59a0117d5de775116e06d7e3cff Reviewed-by: Satyam Bandarapu <ext-satyam.bandarapu@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Recovering from draw failures after EGL surface creation failuremread2012-01-136-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt drawing system is not designed to handle failures in beginPaint and endPaint. But the Symbian port is creating EGL contexts and surfaces on demand in these functions. These can fail, eg in the defect reported the app gets a visibile=true event for such a short period that it fails to create the surface before it is invisible again. These failures have to be coped with. Brush image drawing is failing if the app is asked to draw while in the background, because the EGL surface cannot be created. After this, if the app comes to the foreground at the wrong time, the failed drawing is shown on the screen as a flat colored area. A failedToAlloc variable in the openvg paint engine was locking in this failed drawing, so that it would never redraw. This is fixed by removing all use of that variable. Failed surface creation during a draw in response to a visibility change event was also leaving the window backing store with bad content. This is now cleared on a surface creation failure so that drawing is retried when the next visibility change event arrives. The retry mechanism for creating a surface on failure also makes the problem circumstances more likely to occur and can block the app unnecessarily. Now, instead of blocking for 1 second every time on failed surface creation, it only blocks on the first failure in a sequence thereby allowing other parts of the app to run freely while it is in the background. Task-number: ou1cimx1#951921 Change-Id: I1e27746957ff624b0d9a1cdc9b319d0a3477135d Reviewed-by: Gareth Stockwell <gareth.stockwell@accenture.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Update Supported Platforms Documentation.Sergio Ahumada2012-01-131-0/+2
| | | | | | | Added Ubuntu 11.10 x64 as Tier 1 for Qt 4.8 Change-Id: I319b3970c1bcd6a7550c93e44f50449b3daac7be Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* symbian - fix lockup when a network session is opened from its errorShane Kearns2012-01-131-6/+6
| | | | | | | | | | | | | | | When QNetworkAccessManager::get is called from the slot connected to QNetworkAccessManager::finished, this is equivalent to calling QNetworkSession::open from the slot connected to QNetworkSession::error. Close handles before emitting the error signal, instead of afterwards. Otherwise the session start would be silently cancelled in the above situation. Task-number: ou1cimx1#960395 Change-Id: I48cb376722e0169721fd33614a0b9280c17bdd62 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix typo: jbects->objectsFrederik Gladhorn2012-01-131-1/+1
| | | | | | Change-Id: I051802bbfd127f14f362cbe6ecdf0f48461e360b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix using custom paper sizes on MacAndy Shaw2012-01-131-3/+5
| | | | | | | | | | | | | | This solves the bug with using custom paper sizes on Mac, if a QSize was specified then with a Unit it would not respect this on Mac as it would not convert it correctly. Also paperSize() would return the wrong value. There is already a test for this in tst_QPrinter::testCustomPageSizes() Task-number: QTBUG-18723 Change-Id: I47c0cf2dd48ea3e0daa3b748f337ec38714aaf34 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Build fix for WINCE to qfsfileengine_win.cppJanne Anttila2012-01-121-1/+1
| | | | | | | | | | | | | | | | QFileSystemEngine::currentPath() returns QFileSystemEntry, but this method expects QString return value. -> Code does not compile for WinCE Switched code to use "QFileSystemEngine::currentPath().filePath()" correspondigly as Windows desktop does if filename does not contain drive letter. This is ok, since WinCE does not support drive letters. Task-number: QTBUG-22499 Change-Id: I211b56a5511e6c3e1b1c4009c8ee2a9c6d2f1746 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* use "cp -R" instead of "cp -r" for *bsd compatibilityMark Brand2012-01-121-1/+1
| | | | | | Change-Id: Ib013e2d36645a782249b543ec9301902484a7708 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 584c9ca120da964323181c53ecfee2a17309b22f)
* Remove implicit const char*->QString cast from QDBusServer's constructorRaphael Kubo da Costa2012-01-121-1/+1
| | | | | | | | | | | Commit 5be6cf0a6e306ed3a51ed5ba89317b1317544eea introduced an implicit cast from const char* to QString in QDBusServer's constructor, which breaks the compilation of applications which use QtDBus when QT_NO_CAST_FROM_ASCII is defined and clang is used. Task-number: QTBUG-23398 Change-Id: Iaba66ab05ae6232f69a3981c2ca168f1ffd7bb05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Add gcc 4.6 for cross buildingMark Brand2012-01-122-0/+45
| | | | | | | Based on commit 1f2598b which did this for win32-g++-4.6 Change-Id: Icbeed880a6810f9e5a121d1b36ed194418b1633b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add missing multiple inclusion guardMark Brand2012-01-121-0/+5
| | | | | Change-Id: I019d468ef683a0d4040782df9d22b198b4cca86b Reviewed-by: hjk <qthjk@ovi.com>
* Remove copyright messages from .pro files.Jason McDonald2012-01-116-17/+0
| | | | | | | | Qt Project files (.pro) are not subject to copyright, and therefore should not contain a copyright notice. Change-Id: I4e3f707a4a2ccc23b0d5c6b312023aa5dcdeb5d5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11164-164/+164
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in translations.Jason McDonald2012-01-1165-173/+105
| | | | | | | | | | | | | | It seems that in the past I have modified the source strings for copyright messages, but have failed to also modify some of the translated versions of those strings. That resulted in some of the strings being duplicated by Linguist and marked as obsolete. This time, I have removed those obsolete duplicates and modified all of the translated versions of the strings where the year is represented with hindu-arabic numbers. The one exceptions is the farsi translation (qt_fa.ts), for which I am unable to translate the year. Change-Id: I224e9402f8cf1f02e301a6601a66680fd8fa5d0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1111517-11575/+11575
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2012-01-096-2/+8
| | | | | | | | | | | 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. Task-number: QTQAINFRA-428 Change-Id: Idd45b04200182e3673195858ec08d31357dcdfaf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2012-01-061-0/+4
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake: fix default value for C++ optimization in vcxproj files
| * qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-01-061-0/+4
| | | | | | | | | | | | | | | | | | For the debug configuration the optimization should be turned off. Reviewed-by: ossi Task-number: QTBUG-23421 Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2012-01-063-4/+4
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0
| * | Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0Zeno Albisser2012-01-063-4/+4
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2012-01-061-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake: fix /MP option for VS 2010
| * | qmake: fix /MP option for VS 2010Joerg Bornemann2012-01-061-3/+3
|/ / | | | | | | | | | | | | | | | | Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010. Task-number: QTBUG-23490 Reviewed-by: ossi Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2012-01-051-1/+2
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Fix crash when creating a QScriptEngine in a native thread
| * Fix crash when creating a QScriptEngine in a native threadSimon Hausmann2012-01-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in http://trac.webkit.org/changeset/48412/ introduced a fix to avoid leaking thread specific data by ensuring get() on ThreadSpecific works even during the thread destruction phase. The fix worked by setting the local data again. However as we can see in the backtrace from QTBUG-22926, the local data should not be set unconditionally, otherwise our destroy function will be called recursively when the local data is still set. Task-number: QTBUG-22926 Reviewed-by: Kent Hansen Tested-and-Reviewed-by: Andy Shaw
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2012-01-0513-24/+313
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix http authentication to a different realm on the same server Fix race in http connection channel Don't fetch credentials from cache following a failed proxy authentication Handle plain socket write errors in SSL Fix for assertion failure Fix faulty logic in http connection pipelining Test case for QTBUG-22875 QThreads on Symbian are named to allow them to be opened externally
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2012-01-0412-23/+296
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix http authentication to a different realm on the same server Fix race in http connection channel Don't fetch credentials from cache following a failed proxy authentication Handle plain socket write errors in SSL Fix for assertion failure Fix faulty logic in http connection pipelining Test case for QTBUG-22875
| | * Fix http authentication to a different realm on the same serverShane Kearns2012-01-042-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression caused by the NTLMv2 authentication patch. I have manually tested NTLMv2 authentication against MS IIS and reverting these two lines does not break it. Task-number: QT-5209 Change-Id: I64159cbe468e1a7f834f8726fd0c9d4ab4c54b38 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry-picked from 4954f71648aa7f74a4cb8b1dd26470b5da44459e)
| | * Fix race in http connection channelShane Kearns2012-01-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When authentication is cancelled, close the channel instead of the underlying socket. The previous behaviour could result in further requests being sent on the closed socket, which caused errors in case of https over a proxy. Change-Id: I3dbfc164de4fb29a426c06acaac8f29b9da1d705 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit a7b99151f4445755c91d5227607d9ea2f785301f)
| | * Don't fetch credentials from cache following a failed proxy authenticationShane Kearns2012-01-048-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add variable to QAuthenticatorPrivate for tracking failure Track authentication success/failure in http proxy socket engine Track authentication success/failure in http connection channel Task-number: QTBUG-22875 Change-Id: Id5d39e839428271ad687e9da12fbbdea9c478f4f Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry-picked from d24aad82896addce88f1ffb4040560e406acf083)
| | * Handle plain socket write errors in SSLShane Kearns2012-01-041-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an ssl socket is closed during connecting, and it is using a proxy then it is possible for the plain socket to be in pending close state when transmit() is called. As errors were not handled, this caused the socket (and https request) to "hang". It now propagates the error from plain socket. Change-Id: I6fb86815a2a63e197cea582f4b153e487543477c Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 2cc78885b0b7d08f965998d156945a077e56c1d8)
| | * Fix for assertion failureShane Kearns2012-01-042-1/+6
| | | | | | | | | | | | | | | | | | Change-Id: I97b9ecc37e938a3050793fc746288243a1cb40b7 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 96cda705dcbeb79429055c1acca91f149d318820)
| | * Fix faulty logic in http connection pipeliningShane Kearns2012-01-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code which prevents pipelining of requests when authentication is in use had || where && should have been used. Also check for blank user with a password. Change-Id: Ic278cedd370c9d81377f49a0af43aef415cb49ad Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 058fb94afff8a1a9989ab6d18dacc1fe43769fdb)
| | * Test case for QTBUG-22875Shane Kearns2012-01-041-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test the authentication cache works properly with "cancelled dialogs" or if the user enters username/password incorrectly. Expected behaviour is based on web browsers: If cancelled, current request fails, and prompt again the next time. If wrong password is given, prompt again and retry the current request. If bad credentials are in the cache, prompt again Task-number: QTBUG-22875 Change-Id: Ic02ccac8dbeb3f2580ca4ffe47d0773982c4ab25 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from 4be2430)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2012-01-041-1/+17
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: QThreads on Symbian are named to allow them to be opened externally
| | * QThreads on Symbian are named to allow them to be opened externallymread2012-01-041-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt 4.7 implementation of QThread on Symbian used libpthread. This automatically generated a random name for a thread. The Qt 4.8 implmentation was leaving threads unnamed. This is a change in behaviour, in that unnamed/anonymous threads cannot be opened outside of the owning process. This was causing a bug in some client/server situations. The fix is to generate a name for the RThread underlying the QThread as follows: QThread object name + QThread object address + random number Task-number: ou1cimx1#959586 Reviewed-by: Shane Kearns
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2012-01-040-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2012-01-04358-1403/+1607
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (21 commits) Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny" Also correctly apply stack size difference in MSVC2008 Doc: Add `-xunitxml' option to qtestlib documentation Add a default alt attribute to img tags. tests: eliminated usage of qttest_p4.prf [part 3] tests: eliminated usage of qttest_p4.prf [part 2] tests: allow unstable tests to be marked with CONFIG+=insignificant_test tests: eliminated usage of qttest_p4.prf Revert variable overwritten by copying from Qt5 New style sheet for offline (QCH) documentation New style sheet for offline (QCH) documentation Symbian: Fix exporting and importing of some functions for autotests Symbian: Fix SRCDIR usage in qlayout autotest. Symbian: Fix qcssparser autotest selftests: eliminated usage of qttest_p4.prf Symbian: Fix qscriptextensionplugin autotest Fix crash in positionInLigature Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny Adapt autotests to commit e2773a9 Declarative: Use qDebug() for debugger status updates ...
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2012-01-0398-328/+411
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: eliminated usage of qttest_p4.prf [part 3] tests: eliminated usage of qttest_p4.prf [part 2]
| * \ \ \ Merge remote branch 'dev-codereview/4.8' into qa-staging-masterRohan McGovern2012-01-0398-328/+411
| |\ \ \ \ |/ / / / /
| * | | | tests: eliminated usage of qttest_p4.prf [part 3]Sergio Ahumada2011-12-2933-120/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I65ba34a59db7aa15bc6304e690c825a4d6cd1037 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * | | | tests: eliminated usage of qttest_p4.prf [part 2]Sergio Ahumada2011-12-2966-209/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I8a0bed9161ea9ac010ef3269f2e9baed7bbc2f41 Reviewed-by: Rohan McGovern Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2012-01-026-21/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Adapt autotests to commit e2773a9 Declarative: Use qDebug() for debugger status updates Declarative: Unify output of warning messages in debug server
| * \ \ \ \ Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2012-01-026-21/+24
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-292251-92314/+61467
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (536 commits) Adapt autotests to commit e2773a9 Declarative: Use qDebug() for debugger status updates Declarative: Unify output of warning messages in debug server Added missing license header. Adjust pathes once again. Fixed a link Fixed a link Split behavior and wigglytext examples Rename files to show up in docs. Whitespace changes and added depends. Fix up examples. Fixed some linking issues. Removed unecessary files from folders. Fixes for the manifest and links. Changed some of the short descriptions for WebView examples. Removed unecessary duplicate files. Symbian-linux crosscompilation case changes Fix link to WebView examples. Fix link to ListView and WebView example pages. Fixed lists to be ordered lists and added curly brackets ...
| | | * | | | | Adapt autotests to commit e2773a9Kai Koehne2011-11-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
| | | * | | | | Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-283-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although "Qml debugging is enabled. Only use this in a safe environment!" is a warning, using qWarning() for it let every app crash that is run with QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that happen during 'normal' operation. Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
| | | * | | | | Declarative: Unify output of warning messages in debug serverKai Koehne2011-11-281-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the stream operator instead of toAscii().constData(), or qPrintable. Also use QString::fromLatin1() instead of QString::fromAscii(). Task-number: QTBUG-22860 Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e
* | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-12-311-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny" Doc: Add `-xunitxml' option to qtestlib documentation Fix crash in positionInLigature Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
| * | | | | | | | Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"Sergio Ahumada2011-12-311-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b070ad6a9804b6a7387f848c2e1721c16b8ccc62. Regarding the comments on b070ad6a9804b6a7387f848c2e1721c16b8ccc62 in 4.7, this should not be merged into 4.8 since the internals have changed. Conflicts: src/network/access/qnetworkaccesshttpbackend.cpp
generated by cgit v0.12 at 2025-09-11 00:40:57 (GMT)