summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-181-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Add a warning about trying to release a timer ID that isn't active"
| * | | | | Revert "Add a warning about trying to release a timer ID that isn't active"Olivier Goffart2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2. Revert it in Qt 4.7 because the warning is triggered a lot by Qt itself They are going to be fixed in master. Reviewed-by: Thierry Task-number: QTBUG-16175
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-179-19/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make qvfb compile (and work) with libpng 1.5 Updates to Galician localization don't misdetect powermac host systems when determining target arch Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian make sure Option::dir_sep is initialized in time don't ignore return code from syncqt make qtlibinfix apply to QT_INSTALL_TRANSLATIONS clean up platform detection logic accept -declarative-debug under unix Fix static build on Windows with MinGW. fix -enable-stdcall-fixup usage don't claim declarative debugging support without having declarative installation of translations is now dealt with by translations.pro German translation fixes fix typo in error messages
| * | | | | Fix static build on Windows with MinGW.Mark Brand2011-01-178-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for static code. Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when declaring QtCore functions in svg. Now we change Q_DECL_IMPORT to Q_GUI_EXPORT when declaring QtGui functions into opengl and openvg. Also removed the redundant keyword "extern" from the function declarations. Merge-request: 2540 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| * | | | | fix typo in error messagesOswald Buddenhagen2011-01-171-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Task-number: QTBUG-16369
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-179-41/+193
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix one character displacement for cursor in line edits Fix header not found build error QTBUG-16110 updating the softkeys when app comes to foreground Workaround crash when multiple QNetworkAccessManager instances are used
| * | | | Fix one character displacement for cursor in line editsMiikka Heikkinen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable m_inlinePosition was not updated when m_preeditString was cleared in QCoeFepInputContext. This resulted in cursor displaying up one character beyond where it logically should have been when using HW Qwerty keyboard on E7 and similar devices. Task-number: QTBUG-16238 Reviewed-by: axis
| * | | | Fix header not found build errorShane Kearns2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Task-Number: QT-4378
| * | | | QTBUG-16110 updating the softkeys when app comes to foregroundmread2011-01-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app is in the background and creates a window with softkeys, the softkeys are not updated when the app comes to the foreground, so they look faded. This change updates the softkeys when the app comes to the forground. Task-number: QTBUG-16110 Reviewed-by: Jason Barron
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-177-41/+188
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Workaround crash when multiple QNetworkAccessManager instances are used
| | * | | | Workaround crash when multiple QNetworkAccessManager instances are usedShane Kearns2011-01-147-41/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of each QNetworkAccessManager owning a QNetworkSession, they now share a QNetworkSession if they have the same QNetworkConfiguration. QNetworkAccessManager now uses passive roaming instead of application level roaming. The state change signal (entering connected state) is used to indicate reconnection instead of being triggered when sending an ALR accept(). This preserves the previous behaviour, as QNAM always accepted the suggested access point from bearer mobility. In the case of multithreaded applications, one QNetworkSession will be created for each thread which uses QNetworkAccessManager, as QNetworkSession is not thread safe. Task-number: QT-4378 Reviewed-by: Markus Goetz Reviewed-by: juhvu
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-171-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix double click event on Mac OS X.
| * | | | | Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where the double click would be triggered even with different mouse buttons. Task-number: QTBUG-8222 Reviewed-by: Richard Moe Gustavsen
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-172-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-142-0/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior.
| | * | | Fix memory leakAaron Kennedy2011-01-141-0/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16526
| | * | | Clarify Component.createObject(null) behavior.Martin Jones2011-01-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the parent of the returned item does not affect its object ownership so care must be taken to ensure it is not garbage collected. Task-number: QTBUG-16630 Reviewed-by: Aaron Kennedy
* | | | | various fixes to deal with CI gate failuresJeremy Katz2011-01-141-15/+15
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-142-0/+269
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-0/+269
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-0/+269
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-0/+269
| | | | | |
* | | | | | 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-131-4/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| * | | | Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-16131
* | | | Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added symbianCommandLine function to corelib def files. Task-number: QTBUG-15987 Reviewed-by: TrustMe
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1117-39/+185
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-114-23/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1111-14/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
|/ / /
* | | 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
* | | 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 4.7Lorn Potter2011-01-116-9/+18
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-103822-3838/+3838
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-104-3/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting WA_TranslucentBackground after winid() is ineffective on Symbian. Fix handle leak in symbian QTimer implementation
| | * | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-103-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Symbian doesn't support semi-transparent EGL surfaces. WA_TranslucentBackground attribute is ineffective if set after EGL surface creation. To enable translucency in this case we need to recreate backing store to get raster surface which supports translucency. Task-number: QT-4416 Reviewed-by: Jason Barron
| | * | | Fix handle leak in symbian QTimer implementationShane Kearns2011-01-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer handle was only being closed when a timer was cancelled, which resulted in a leak for one shot timers that have completed normally. Instead the timer is now closed in a destructor (closing null handles is safe, so it doesn't matter if the handle was never created - e.g. in the case of a zero timer) Also added a handle check before creating a timer to prevent a leak in case the start function is called twice in the backend. Task-number: QTBUG-16380 Reviewed-by: mread
| * | | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-102-6/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should check not just p but also n in next()/previous(), which is what isValid() does. Otherwise n == 0 will cause crash in QFragmentMap. Task-number: QTBUG-16279 Reviewed-by: Eskil
| | * | | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 532115bcaa370af827a5cbad017b272842c5aacf introduced a regression by fixing a typo in the QT_OPENGL_ES_2 macro. This caused a broken and untested code path to be used in the GLES2 case. Since the QImage scanlines are 32 bit aligned, QImage::width() cannot be used when copying the data. Rather than pass in bytesPerLine() to the GL function, I opted to revert to the proven behavior, where the pad bytes are never read by GL but each scanline is copied separately, to avoid further regressions on different hardware. This also seems like the more correct approach, as the pad bytes should ideally not be copied into the cache texture. Reviewed-by: Samuel
* | | | | Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into ↵Lorn Potter2011-01-114-585/+20
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | integration
| * | | | Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
| | | | |
* | | | | QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like on all other platforms, the pixel size accuracy is now restricted to two digits after the decimal point. Task-number: QTBUG-15688 Reviewed-by: Jiang Jiang
generated by cgit v0.12 at 2025-03-28 05:10:18 (GMT)