| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
using pkg-config from pri file is not good for cross-compiling
Reviewed-by: paul
(cherry picked from commit 9957e85e37345e946ecc67196d65fbca867a2001)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | | | |\ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Andrew den Exter
|
| | | | | |/
| | | | |
| | | | |
| | | | | |
Reviewed-by: Dmytro Poplavskiy
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Fix for cetest.
Speed up compilation of this test with MSVC.
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
Crash in QGraphicsScenePrivate::setFocusItemHelper
Pass the right arguments to QApplication in GraphicsView benchmark.
Improvements to itemview keypad navigation in S60.
Revert changes made in scroll_sys().
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Set the roleNames of proxy models to the roleNames of the source model.
Add benchmarks for accessing meta-object properties via QScriptValue
...
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
New unit tests have identified issues with awin32 backend. These issues
need to be resolved before new unit tests are added.
* stateChanged() signal should only be emitted on change of state
currently signals can be emitted multiple times.
* for output data is being lost when input can be read from
QIODevice but cannot be written to audio sub system.
Task-number:QTBUG-8441
Reviewed-by:Dmytro Poplavskiy
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
New unit tests have identified issues with alsa backend. These issues
need to be resolved before new unit tests are added.
* stateChanged() signal should only be emitted on change of state
currently signals can be emitted multiple times.
* elapsedUSecs() currently uses alsa to provide this value but
this is not reliable enough and this time is reset when
suspend/resuming. This is not correct operation.
* for output data is being lost when input cant be read
from QIODevice but cannot be written to audio sub system.
Task-number:QTBUG-8440
Reviewed-by:Dmytro Poplavskiy
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Detail state changes and error states in QAudioInput and QAudioOutput
documentation.
Reviewed-by: Derick Hawcroft
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Now, you have to reimplement registerTypes(uri) to expose native
QML types, and initializeEngine(engine,uri) to add instances to
the QML engine's root context.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Fix multimedia plugin.
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/multimedia/qml/qml.pri
src/multimedia/qml/qmlaudio_p.h
src/multimedia/qml/qmlgraphicsvideo_p.h
src/multimedia/qml/qmlmediabase_p.h
src/plugins/qmlmodules/multimedia/multimedia.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | | |
QDeclarativeXXX.
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | | | | | | |
|
| | |_|_|/ /
|/| | | | |
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update of the QScriptValue autotest suite.
New autotests cases for QScriptValue autotests generator.
QScriptValue autotest generator templates change.
Fix license template.
QScriptValue::isQMetaObject crash fix.
Implement toLatin1_helper with SSE2
Doc: add \since 4.7 to new QtMultimedia classes
Autotest: add a test to ensure that the Qt headers are clean.
Compile on Linux: close(2) is defined in #include <unistd.h>
Improved gesture event delivery in graphicsview.
Fixed a gesture autotest.
Cache scene coordinates of a hotspot in a QGesture.
Add an extra operator delete() to QSharedPointer's internals.
Fix compilation on x86 with gcc if SSE2 is not enabled
Comments the SSE implementation of fromLatin1_helper()
Build fixes for the SIMD functions
Implement QString::fromLatin1_helper() with SSE2
Cache the result of qDetectCPUFeatures()
Move the SIMD detection from QtGui to QtCore
Prevent stale QWidget pointers in QCocoaView
|
| | | |/ /
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QMediaContent test; make sure to use network.
Rebuild configure.exe
Add -mediaservice argument to configure.
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Nicholas Young
|
| | | | | |/ /
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Kurt Korbatits
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Now consistent with QMediaResource.
Reviewed-by: Dmytro Poplavskiy
|
| |/ / / / / |
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
src/multimedia/playback/qmediaplayer.cpp
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix compilation with namespace.
Fix compilation with namespace.
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
Second attempt at work-around for MSVC2008 compiler crash
QNativeSocketEngine: Fix some error handling related to waitFor*()
qdoc: List new QML elements in \sincelist for What's New page.
Cocoa: fix namespace build
Cocoa: Fix build with namespace
Cocoa: namespace build fix
doc: Fixed some qdoc errors.
Don't include private headers from public headers.
Fix compilation on HP-UXi: m_volume is a #define
WinCE doesn't have sys/types.h
Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
Cocoa: calling QEventLoop::exec from mouse up causes problem
Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
Doc: Collected the Declarative UI tutorials together and renamed them.
Doc: Simplified Commercial Editions for Qt 4.7.
Work around MSVC2008 compiler crash
doc: Added "\since 4.7" to a bunch of declarative stuff.
Cocoa: event dispatcher eats mouse events
Fix an issue about double-click on Mac OS X.
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
added/removed namespace macros as needed
|
| | | | | | |
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits)
Fix compilation on HP-UXi: m_volume is a #define
WinCE doesn't have sys/types.h
Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
Cocoa: calling QEventLoop::exec from mouse up causes problem
Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
Doc: Collected the Declarative UI tutorials together and renamed them.
Doc: Simplified Commercial Editions for Qt 4.7.
Work around MSVC2008 compiler crash
doc: Added "\since 4.7" to a bunch of declarative stuff.
Cocoa: event dispatcher eats mouse events
Fix an issue about double-click on Mac OS X.
qdoc: Finished "Inherited by" list for QML elements.
Avoid calling out to public API in the QtScript implementation
Move property helper functions to QScriptEnginePrivate
Move more script value conversion code to helper functions
Cleanup: Move value conversion code to helper functions
Move implementation of QScriptValue construction functions to private class
Cleanup: Move number conversion functions to QScriptEnginePrivate
Move some helper function declarations outside QT_NO_QOBJECT guard
...
|
| | | | | | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | | |
Newer Linux systems (glibc 2.10, gcc 4.4) are much better at not
leaking symbols, so you have to include the proper headers.
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Documentation fixes.
Add a qRegisterQmlElements function to QtMultimedia
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Nicholas Young
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Avoid exposing private classes.
Reviewed-by: Bill King
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
Add convenience function QTextCursor::positionInBlock()
Fixed URL in Russian translation.
Designer/Resourceview: Suppress warning about QFileInfo on empty path.
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly irrelevant when converting internal data
structures which are raw utf16 in host byte order. so replace it with
QString::fromUnicode() where possible (which seems to be everywhere).
the reasoning is the same as in commit e0fda52f, so not getting further
reviews.
Reviewed-by: denis
Reviewed-by: joao
|
