summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | | | | | | | | | | | | | | | The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
| |\ |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| | | | | | | | | | | | | | | | | | | | This new method tests 4 cases (http/https, with/without buffer size) and checks the send/receive rates to check that the actual transfer rate was limited, not just the speed of emission of data to the application. Task-number: QTBUG-6276 Merge-request: 872 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
| * Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | "error: invalid pointer to bit-field `QAbstractStatePrivate::isMachine'" The extra qualification is not needed anyway, so remove it. Task-number: QTBUG-14491 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-015-8/+8
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-10538 Reviewed-by: Trust Me
| | * Fix a few typos in comments and docs.Jason McDonald2010-11-014-4/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-13714 Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-013-1/+60
|\ \ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Quickly clicking an item that doesn't use double clicking should result in two separate clicks
| * | | Quickly clicking an item that doesn't use double clicking should result in ↵Joona Petrell2010-11-013-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | two separate clicks Task-number: QTBUG-14832 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-011-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix OpenVG painting artifacts after restoreState().
| * | | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When the state is restored and the 'dirty' flag indicates that the clip state has changed, the paint engine needs to set 'scissorDirty' flag to true so that updateScissor() applies the restored clip region to the scissor rects. Task-number: QTBUG-14907 Reviewed-by: Jani Hautakangas
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0168-5595/+11728
|\ \ \ | |/ / |/| / | |/ | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QML visual tests on Mac.
| * Fix QML visual tests on Mac.Yann Bodson2010-11-0168-5595/+11728
|/ | | | Task-number: QTBUG-14792
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-302-0/+36
|\ | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fix Windows compilation. Fixed race condition in raster paint engine.
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-302-0/+36
| |\ |/ / | | | | | | Conflicts: tests/auto/qpainter/tst_qpainter.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-272-0/+36
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Windows compilation. Fixed race condition in raster paint engine.
| | * Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| | | | | | | | | | | | | | | | | | | | | Don't take for granted that these are included... Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
| | * Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
| |/ | | | | | | | | | | | | We need to protect the gradient cache accesses with a mutex. Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-292-12/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dbus does not use this. fix build. Fix memory leak on exit
| * | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | | | | | | | | | | | Reviewed-by: trust me
| * | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
| | | | | | | | | | | | | | | | | | | | | The confFile was lost if the cache was already gone (e.g. on app exit). This patch ensures that the confFile is always deleted. Reviewed-by: João Abecasis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2966-32/+19931
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update webview visual tests to new skip mode Remove unnecessary QML import project dependency to Symbian deployment pri file used by Qt demos Update visual tests for Mac Revert "Disable WebView visualtests" Mark dynamic.qml as expect-fail the new way Update gridview visual tests Revert "Mark qdeclarativegridview autotests as expect-fail"
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-298-6/+25
| |\ \ \
| | * | | Remove unnecessary QML import project dependency to Symbian deployment pri ↵Joona Petrell2010-10-293-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file used by Qt demos Task-number: QT-4197 Reviewed-by: Jason Barron * breaks compilation of releases that omit Qt demos directory * qt import plugins have different deployment configuration than demo applications * declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri that is basically a copy from qpluginbase.pri written for plugins
| | * | | Update visual tests for MacYann Bodson2010-10-294-0/+22
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| * | | | Update webview visual tests to new skip modeAlan Alpert2010-10-2913-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
| * | | | Revert "Disable WebView visualtests"Alan Alpert2010-10-2924-0/+12940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ba02a8f5a537b9f7e1ff671abe6eed67029db58. ExpectFail state has been altered. Redoing that commit. This commit also adds the new line to indicate tests we don't care about
| * | | | Mark dynamic.qml as expect-fail the new wayAlan Alpert2010-10-299-2/+1605
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the check for the old way in tst_qmlvisual Task-number: QTBUG-14792
| * | | | Update gridview visual testsAlan Alpert2010-10-2913-373/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug found in gridview.qml doesn't actually stop the test from passing, so it's now updated. Task-number: QTBUG-14792
| * | | | Revert "Mark qdeclarativegridview autotests as expect-fail"Alan Alpert2010-10-2925-4/+5338
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6ee57e14e145d9caa3f572d55447ec92f78cea4. Changed our mind about how to mark tests as expect-fail
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2936-522/+792
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Play whole file in spectrum analyzer demo Do not unnecessarily reset state of spectrum demo Set SpectrumAnalyserThread parent to 0 before calling moveToThread() Avoid being killed by graphics out-of-memory monitor. Revert function renaming in QtOpenVG. Support tactile feedback in QWidgets from QS60Style Support tactile feeedback from QS60Style for QWidgets Making the buttons less finger unfriendly Readded .def file entries after a little stunt Do not crash on Symbian Temporarily remove .def file entries for a little stunt Fixed crash with QClipboard in Symbian^3 Fallback to vgWritePixels in drawPixmap.
| * | | | Play whole file in spectrum analyzer demoGareth Stockwell2010-10-2911-467/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change required a significant refactoring of the application, including: * Re-write WavFile class so that it inherits from QFile rather than taking a QIODevice as an argument to its method calls. * Modified Engine class so that its internal QByteArray buffer (m_buffer) need not correspond to the entire clip. This was done by introducing the m_bufferPosition variable, which indicates the offset from the start of the clip to the start of the region of the clip which is currently held in memory. For tone generation and record/playback modes, the buffer does still map directly to the whole clip, so m_bufferPosition is always zero. For file playback, the WavFile instance is the QIODevice which is passed to QAudioOutput; m_buffer is just the part of the file which is currently in memory for spectrum analysis, level calculation and waveform rendering. * For file playback, introduced a second WavFile instance as a member of the Engine class. This is because QFile::seek() is called in order to read the part of the file currently required for analysis. If the QAudioOutput implementation passes its QIODevice across a thread boundary, this seeking causes playback to jump around within the file rather than progressing smoothly forward. * Modified the audioLength utility function so that its return value is always a multiple of the sample size. In the process of making the above changes, a few other minor modifications were made: * Modify all internal APIs concerned with buffer offsets and lengths to deal in bytes. Previously, some calls passed values in microseconds and others in bytes, which was confusing. * Remove write functionality from WavFile class, since it is not used in this application. Task-number: QTBUG-12936
| * | | | Do not unnecessarily reset state of spectrum demoGareth Stockwell2010-10-293-45/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch ensures that the state of the application is not reset when: - Any of the 'Play generated tone', 'Play file' or settings dialogs are opened - Any of the 'Play generated tone', 'Play file' or settings dialogs are dismissed by pressing the Cancel button - A new input or output device is selected via the settings dialog, and that new device supports the data format which is currently being used within the application - The window function is changed via the settings dialog Note that the application is still reset if a new input or output device is selected via the settings dialog, and this device does not support the current data format. Task-number: QTBUG-12935 Task-number: QTBUG-14810
| * | | | Set SpectrumAnalyserThread parent to 0 before calling moveToThread()Gareth Stockwell2010-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | QObjects with a parent cannot be moved to a different thread.
| * | | | Avoid being killed by graphics out-of-memory monitor.Jason Barron2010-10-291-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application requests more graphics memory, the GOOM monitor will start looking for other applications to kill in order to recover the requested graphics memory. The first step in this process is to send a custom event to the application indicating that it is a candidate for termination. If the application does not acknowledge this event, it will be killed immediately. However, since Qt releases its graphics memory when the app is obscured, we should indicate that we handle this event such that Qt has a chance to finish freeing resources. If after a certain time, the app has not freed its resources it will be killed anyway. This essentially buys Qt some time to avoid the case where Qt apps are killed while they are cleaning up. Task: QTBUG-14858 Reviewed-by: Jani Hautakangas
| * | | | Revert function renaming in QtOpenVG.Jani Hautakangas2010-10-293-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions were accidentally thought to be in private scope. Renaming broke BC. Reviewed-by: Jason Barron
| * | | | Support tactile feedback in QWidgets from QS60StyleSami Merila2010-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addition to previous task. Remove white-space from .pro-file. Task-number: QT-4037 Reviewed-by: Janne Koskinen
| * | | | Support tactile feeedback from QS60Style for QWidgetsSami Merila2010-10-2910-2/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently tactile feedback is not given for QWidgets running on Symbian even if the native side supports this (Sym^3 and 5th Edition devices). This task adds support for QWidgets having QS60Style. The tactile feedback has been implemented as a plugin that the style loads when instantiating itself for touch devices. NOTE that the feedback is NOT supported by the emulated style, nor is the plugin interface public, so it cannot be used outside of style. The implementation is simplistic, since we only want to provide stop-gap solution until 4.8 when real Qt feedback implementation is ready. The implementation will only give feedback for touch-down events for visible, interactive and enabled widgets. Sliders and scrollbars will use sensitive feedback (slightly less aggressive) and all others will use basic feedback. Note that Sym^3 adds tens of different feedback categories, which this plugin ignores as we want to share the same implementation for Sym^3 and 5th ed. In distributed Qt package there is no tactile feedback for 5th edition, due to package creation limitations. Support can be added manually by re-compiling Qt on top of 5th Edition SDK. Task-number: QT-4037 Reviewed-by: Jani Hautakangas Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2913-53/+145
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Making the buttons less finger unfriendly Readded .def file entries after a little stunt Do not crash on Symbian Temporarily remove .def file entries for a little stunt Fixed crash with QClipboard in Symbian^3 Fallback to vgWritePixels in drawPixmap.
| | * | | | Making the buttons less finger unfriendlyAlessandro Portale2010-10-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I did not dare to apply the same fix to the samegame tutorials, since those are completely diverged from the demo.
| | * | | | Readded .def file entries after a little stuntAlessandro Portale2010-10-282-0/+4
| | | | | |
| | * | | | Do not crash on SymbianAlessandro Portale2010-10-285-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml debugging enabler in QtDeclarative made any Qt app crash which used QDeclarative. Reason was that QtDeclarative.dll tried to directly access (private) writable static data from QtGui.dll. This patch adds an accessor function for the data to QtGui, and the crash is gone. Done-by: Kai Koehne Reviewed-by: Kai Koehne Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
| | * | | | Temporarily remove .def file entries for a little stuntAlessandro Portale2010-10-282-4/+0
| | | | | |
| | * | | | Fixed crash with QClipboard in Symbian^3Titta Heikkala2010-10-281-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QClipboard now returns copied data outside TRAP to prevent TRAP levels to get crossed. Task-number: QTBUG-14790 Reviewed-by: Janne Koskinen Merge-request: 897 Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | * | | | Fallback to vgWritePixels in drawPixmap.Jani Hautakangas2010-10-285-28/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vgWritePixels, if possible, in case where VGImage for QPixmap can't be allocated due to low GPU memory situation. This patch also renames some VG paint engine internal functions to clarify their purpose. Task-number: QT-3589 Reviewed-by: Jason Barron
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-2929-361/+297
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) QNAM: Fix doc rendering of QNetworkRequest remove the connecting thread, and use async call to dbus instead. QScriptValue::construct(): Don't crash if function throws non-Object Network code: Fix code comment spellchecking errors. QNAM: fix build QNAM HTTP: Remove the error() of QHttpNetworkConnection QNAM HTTP: Remove enableEncryption() QNAM HTTP: Remove unused code QNAM HTTP: Move authenticationRequired() to QHttpNetworkReply QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply QNAM HTTP: Move cacheCredentials() to QHttpNetworkReply QNAM HTTP: Use sslErrors() from QHttpNetworkReply QNAM HTTP: Remove Wait4AuthState QNAM: Internal function renaming QNAM HTTP: Internal variable spelling mistakes QNAM HTTP: Pause connection when emitting proxy auth signal QNAM HTTP: Also pause connection when emitting sslErrors() QNAM HTTP: Also resume uploads after connection pause QNAM HTTP: Process authenticationRequired() from HTTP properly QNAM HTTP: Pause sockets while emitting to user code. ...
| * | | | | | QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| * | | | | | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case where the connection threads are never stopped until desctuctor. Task-number: QTBUG-14836 Reviewed-by: trust me