| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
The mutex proctecting the queue was being released and reacquired
between when the head and tail are cleared, making it possible to append
a new item to a popped, or even deleted tail, resulting in a lost event.
|
|
|
|
|
|
| |
When stopped, paused, at the end of media, and after a seek. This
prevents progress bars stopping just short of the end because the last
timed progress updates was 300ms before the end of playback.
|
|
|
|
| |
Was off by one resulting in repeated playback of mp3s being cutt off.
|
| |
|
|
|
|
| |
The correct function is freeData().
|
|
|
|
|
|
|
| |
This reverts aec0628295cda95f2169e3007368797ba6585ee3 and fixes the
actual problem, which is the destructors for for classes inheriting
QMediaObjectPrivate weren't being called resulting in QPointer
destructors also not being called.
|
|
|
|
| |
Where unusable is not readable or sequential.
|
|
|
|
|
|
| |
Explicitly clear the QPointer to QVideoWidget on destruction, otherwise
the destruction of the QVideoWidget will seeminly attempt to clear an
invalidated QPointer.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Changing the video output is a heavy task and is likely to interrupt
playback. Not really worth the cost for knowing the video isn't being
decoded while it cant be seen.
This also applies to the QGraphicsVideoItem.
|
|
|
|
|
|
|
| |
Must remove the decoder as well as the output otherwise the graph wont
be able to resume because a disconnected decoder cant.
And the graph must be stopped to connect a new output.
|
| |
|
|
|
|
| |
Was mapped to frequency instead of sampleRate.
|
|
|
|
| |
No longer exists.
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a shared QScriptEngine for debugger console command scripts
Fix QtScript debugger hang/crash issue with updating locals model
doc: Fixed some qdoc warnings.
Always activate popup windows on show
doc: Fixed some qdoc warnings.
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Cocoa: Tool Windows steal focus from the main window
qdoc3: Removed a debug output.
Update QTestLib documentation with chart use case.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A single engine was used for each script (i.e. command), which was
just ridiculous. Use one engine with multiple global objects to
isolate each script's state.
Task-number: QTBUG-7227
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since the model is updated lazily, it's possible that a new model
has been set on the view (and the old model deleted) before the old
model has finished refreshing. This was discovered while holding
down the F11 key (Step Into) when debugging plasma.js in the
script/context2d example, which causes many events (and hence
asynchronous model updates) to trigger rapidly.
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem was that popups that were opened
from a system tray icon did not get activated
and clicking outside would not close
the popup as intended. Ensuring that all popups
get activated on show should solve this problem
in the general sense.
Task-number: QTBUG-7386
Reviewed-by: denis
|
| | |/ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This give the possibility to get the file name with the extension and
without the path.
Reviewed-by: Joao
Reviewed-by: Marius Storm-Olsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The example that shows this off is tools/inputpanel. This example is
strangely written, and calls activateWindow on the main window in an
activate callback to another window. So a bit recursion will happend,
and this caused troubble for the cocoa port. In addition, in Qt several
windows can be active at the same time, expecially tool windows. This
means that we need to be careful when returning early from the
becomeKeyWindow methods for NSWindow. This patch fixes up on this stuff.
Task-number: QTBUG-6002
Reviewed-by: msorvig
|
| | |/ |
|
| | |\ |
|
| | | | |
|
| | |/ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed wrong variable name
QHeaderView: fixes sectionClicked() emitted with wrong section index
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Olivier
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The obvious fix is to use the previsously computed 'section' as paramatter.
(It is even faster)
But one might wonder why logicalIndexAt() does not return the same result
before and after flipSortIndicator(). The reason is that while being
sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden
again. Leaving some pending computation.
Task-number: QTBUG-7833
Reviewed-by: Gabriel
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits)
Rhys Weatherley's changes for 4.6.2
Autotest: to be sure, generate .cpp files with the proper headers too
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
revert to fromUtf16() usage in fromWCharArray()
S60 softkey refactoring (support for merging, priorities and menus)
Implementation for QVGPixmapData to/fromSymbianCFbsBitmap
Updated changlog 4.6.2
Fix license headers on these new files (and the generator).
Add auto-generated tests for QScriptValue
Add changes for 4.6.2
Assistant examples: Fix missing QLatin1String.
Changelog: Added Designer/uic3 changes for 4.6.2
Revert "Improve raster graphics system performance on Mac."
Added Czech translations.
Introduce of QScriptValue autotest generator.
Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"
Fixed potential crash in mac style
...
|
| | |\ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Rhys Weatherley's changes for 4.6.2
|
| | | | | | |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Error strings are now part of the Phonon::MMF namespace.
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Putting the code for "case CT_ComboBox:" into {}
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
fixed during merge to match new style flag setting.
Reviewed-by: Janne Koskinen
|
| | | | |\ \ \ \ \
| | | | | |/ / / / |
|
| | | | | |\ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
|
| | | | |\ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \ |
|