summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1710497-14676/+19087
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-176-0/+382
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fixed CI gate flagged spelling error: occured -> occurred file rename various fixes to deal with CI gate failures Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | * fixed CI gate flagged spelling error: occured -> occurredJeremy Katz2011-01-161-1/+1
| | |
| | * file renameJeremy Katz2011-01-141-100/+0
| | |
| | * various fixes to deal with CI gate failuresJeremy Katz2011-01-144-16/+117
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-145-0/+381
| | |\ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-135-0/+381
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | | * Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is staticJeremy Katz2011-01-133-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test failed to build because QNetworkProxyFactory can't be instantiated (pure virtual member queryProxy()), but doing so isn't necessary. The test has also been removed from the network tests because it relies on a static configuration, but can not guarantee that the configuration exists.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-136-0/+383
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNetworkProxyFactory::systemProxyForQuery() for Symbian
| | | | * QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-126-0/+383
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-141-3/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Proper fix for QGraphicsItem crash.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-131-3/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Proper fix for QGraphicsItem crash.
| | | * | Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7 Task-number: QTBUG-16374 Reviewed-by: TrustMe
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-133-10/+25
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QSharedMemory and QSystemSemaphore autotests for Symbian Fix QSystemSemaphore handle management issues in Symbian
| | * | | Fix QSharedMemory and QSystemSemaphore autotests for SymbianMiikka Heikkinen2011-01-132-6/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Janne Koskinen
| | * | | Fix QSystemSemaphore handle management issues in SymbianMiikka Heikkinen2011-01-131-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSystemSemaphore native RSemaphore handle was unnecessarily created again on each acquire. The creation logic was also susceptible for random failures when two or more threads tried simultaneously acquire the semaphore. Task-number: QTBUG-16615 Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-136-4/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix doc typo Document centerIn and fill in the anchors docs Document level of support for QGraphicsObject properties Add an autotest for QVariant method params Don't crash Qt Creator when debugging an object alias Consistent Docs
| | * | | | Fix doc typoAlan Alpert2011-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Tidy up that section a little, while I'm at it.
| | * | | | Document centerIn and fill in the anchors docsAlan Alpert2011-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16467
| | * | | | Document level of support for QGraphicsObject propertiesAlan Alpert2011-01-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the context of QML, they are not officially supported as public API unless otherwise documented in QDeclarativeItem. This commit mentions that somewhere. Task-number: QTBUG-15797 Reviewed-by: Martin Jones
| | * | | | Add an autotest for QVariant method paramsAaron Kennedy2011-01-132-0/+18
| | | | | |
| | * | | | Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16131
| | * | | | Consistent DocsAlan Alpert2011-01-131-3/+11
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Example contradicted later docs. Fixed example. Task-number: QTBUG-16596
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1327-43/+460
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure on platforms other than Symbian Fix corelib def files. Fix qglthreads test crash on Symbian Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | * | Fixed build failure on platforms other than SymbianGareth Stockwell2011-01-121-2/+8
| | | | | | | | | | | | | | | | Reviewed-by: Ruth Sadler
| | * | Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added symbianCommandLine function to corelib def files. Task-number: QTBUG-15987 Reviewed-by: TrustMe
| | * | Fix qglthreads test crash on SymbianJani Hautakangas2011-01-121-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use less GPU memory to make tests pass and skip threaded rendering since eventually tries to access main RWindow from secondary thread, which is not allowed on Symbian Task-number: QTBUG-13525 Reviewed-by: TRUSTME
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1124-41/+434
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1124-41/+434
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | | * | Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-01-112-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selfsigned qt.sis no longer installs on top of sqlite3_selfsigned.sis as patching embedded sises and dependencies was removed from patch_capabilities.pl script. However, since the regular sqlite3.sis is nowadays signed for all three Symbian manufacturers that Qt supports, there is no more need to have a self-signed sqlite3.sis in the first place, so it is removed to reduce confusion. Task-number: QTBUG-16576 Reviewed-by: axis
| | | * | Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-115-25/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Symbian application is launched using RApaLsSession::StartApp, command line parameters can be given with CApaCommandLine::SetTailEndL and will now be correctly interpreted by Qt applications as command line parameters. There are a couple of limitations: 1) The parameters given with CApaCommandLine::SetTailEndL will not be available in main method's argv array; they can be accessed via QCoreApplication::arguments function. 2) CApaCommandLine::SetTailEndL does support any arbitrary binary data as parameter, but only 8-bit string data gets parsed properly into QCoreApplication::arguments. For other kind of tail data, you need to subclass QS60MainAppUi and implement ProcessCommandParametersL callback. Task-number: QTBUG-15987 Reviewed-by: axis
| | | * | Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16513 Reviewed-by: Gareth Stockwell
| | | * | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1117-14/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-112-2/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rebuild configure Doc: Fixed a few misspellings of Flipable
| | * | rebuild configureOswald Buddenhagen2011-01-111-0/+0
| | | |
| | * | Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-112-2/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Install each test in a separate directory Do not override the target path if already defined Attempt to cure my pathological inability to type the word "package".
| | * Install each test in a separate directoryAdrian Constantin2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | It prevents collision of test data. Reviewed-by: Lucian Varlan
| | * Do not override the target path if already definedLucian Varlan2011-01-111-1/+4
| | | | | | | | | | | | Reviewed-by: Adrian Constantin
| | * Attempt to cure my pathological inability to type the word "package".Jason McDonald2011-01-111-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-111-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: OpenVG paint engine doesn't draw glyphs well to non-integer offsets.
| | * | OpenVG paint engine doesn't draw glyphs well to non-integer offsets.Jani Hautakangas2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solution is to round adjustment offsets to integer values to prevent blurry text. Task-number: QTBUG-16240 Reviewed-by: Alessandro Portale
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-111-1/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QTextCodec::codecForMib: actually use the cache
| | * | QTextCodec::codecForMib: actually use the cacheOlivier Goffart2011-01-111-1/+4
| |/ / | | | | | | | | | | | | | | | Was removed by mistake in commit 02aecce59cb76ceb88f635203553 Reviewed-by: Peter Hartmann
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-114-585/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix ConnMan bearer plugin to use new net.connman service name.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-111-4/+4
| | |\ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-101-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update QTextOdfWriter test case to match actual (correct) output
| | * | Update QTextOdfWriter test case to match actual (correct) outputBrad Hards2011-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ODF 1.1 Specification Section 15.5.11 shows the element names are tab-stops and tab-stop (not style-tab-stops and style-tab-stop, which are just ref in the schema). Merge-request: 1012 Reviewed-by: Olivier Goffart
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-117-9/+56
| | | |\ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-1010434-10534/+10537
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
generated by cgit v0.12 at 2024-11-12 20:14:45 (GMT)