| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(cherry picked from commit 7fd5ade07bd05ff6cb6f4e7cfa7a74081b803809)
|
|
|
|
|
| |
Simply copy the demo directories, instead of writing a stub .pro file.
(cherry picked from commit c97e1e29aedaceead92cd231b3a77d60bab2af50)
|
|
|
|
| |
(cherry picked from commit a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73)
|
|
|
|
| |
(cherry picked from commit 23440d84ddf78755e77cea75956cd7445647230a)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit f56893bbffd5eb26dd77e56707615cbb11a26c9b)
Conflicts:
demos/declarative/minehunt/minehunt.cpp
|
|
|
|
|
| |
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
(cherry picked from commit 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd)
|
|
|
|
|
|
|
|
|
|
| |
Qt Creator detects Qt versions by running qmake. This fails if no
MinGw setup is in the path as is usually the case when starting it
from the menu. Make it possible to run qmake without setup. Strip
executable.
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Reviewed-by: mariusSO <qt-info@nokia.com>
(cherry picked from commit 52da988db3a03bce5513bc5e2efa3d69f3664f24)
|
|
|
|
|
|
|
|
| |
the mode is a big hack, and consequently needs hacks to get started
as well ...
Reviewed-by: mariusSO
(cherry picked from commit a1b0dba9971ef88dc1e079d1ea49230a4dd3c514)
|
|
|
|
|
| |
Reviewed-by: mariusSO
(cherry picked from commit 375edf788be3f51d6bebc438142642ce53004170)
|
|
|
|
|
|
|
|
|
| |
inspired by the pbx generator.
currently this has no effect, as all generators build their own
fallbacks anyway.
Reviewed-by: mariusSO
(cherry picked from commit f006691acc45a57e011e5827163c0b3759864bf7)
|
|
|
|
|
|
|
|
|
|
| |
the generators change the value of QMAKE_QMAKE, so it is unwise to
"redirect" it to a hidden builtin which is reset each time.
in particular, this fixes qmake generating makefiles without an absolute
path to qmake itself - the initial quoting of the filename will make the
variable "real", so contains() will start working for it.
(cherry picked from commit 31e1fb9103e6d6657c1153f5c30e149087568042)
|
|
|
|
|
| |
Author: Erik Verbruggen
(cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)
|
|
|
|
|
| |
This was causing crashes in the qmldesigner.
(cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)
|
|
|
|
|
|
|
| |
using pkg-config from pri file is not good for cross-compiling
Reviewed-by: paul
(cherry picked from commit 9957e85e37345e946ecc67196d65fbca867a2001)
|
|
|
|
|
|
| |
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Acked-by: akennedy <qt-info@nokia.com>
(cherry picked from commit 13f23b71cee682ccaaec455d72b1578afc2800ee)
|
|
|
|
|
|
|
| |
Make source a designable property, add missing declarations for
enumerations.
Reviewed-by: akennedy <qt-info@nokia.com>
(cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
|
|
|
|
|
| |
Reviewed-by: Paul Olav Tvete
(cherry picked from commit a7196feb11d701dd486e66fd06cbc50d84c9b1bb)
|
|
|
|
|
|
|
| |
only use xmlpatterns if Qt is configured to build it
Reviewed-by: Paul Olav Tvete
(cherry picked from commit 454d4fa2fbefabb54f7f567aaf01f2c1faa165f4)
|
|
|
|
|
|
|
| |
do not include headers of disabled modules
Reviewed-by: Paul Olav Tvete
(cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)
|
|
|
|
|
|
|
| |
need to add the win32 file to get copy and friends included
Reviewed-by: Simon Hausmann
(cherry picked from commit 57686d28fed85c9f8fbb340cd05f3fb6322332f7)
|
|
|
|
|
| |
Reviewed-by: Gunnar Sletta
(cherry picked from commit 72da039e54a62bf3a481fefc753e0e50ba75df57)
|
|
|
|
| |
(cherry picked from commit 45d91603e65f78cb749bcc2c8949ef24048761df)
|
|
|
|
|
|
| |
Game works again, and the issue with X11 native rendering being
abysmally slow has been 'fixed'.
(cherry picked from commit bcb2ed5667bd957476e3b62ef3a479a26f1252f3)
|
|
|
|
|
|
|
| |
It still isn't working though. Investigations continue.
Task-number: QTBUG-8549
(cherry picked from commit 3a4dc08d08ce0388dd183a24923871e3e03ba531)
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't use SSE2 if the emmintrin.h header wasn't found.
|
|/
|
|
|
|
| |
If you build on Solaris, the header isn't available, but SSE2
instructions are available on x86-64. So either we use inline
assembly, or we disable the new code.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | | |\
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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: Dmytro Poplavskiy
|
| | | | | | | | | |\ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: Justin McPherson
|
| | | | | | | | | | |\ |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: Andrew den Exter
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Currently the main monitor color space is used.
Colorspace correction is disabled by default for
renderer video output, since video frames can
on any output device, not only on the main monitor.
Reviewed-by: Justin McPherson
|
| | | | | | | | | | |/
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QuickTime doesn't start movie playback as soon as it loaded,
it's necessary to start manualy after suitable load state reached.
Reviewed-by: Justin McPherson
|
| | | | | | | | | |/
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Dmytro Poplavskiy
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Move a QFile include outside the namespace.
Reviewed-by: Justin McPherson
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
There a number of interfaces and guid constants used by the media service
that aren't defined by mingw. Define these locally.
Reviewed-by: Justin McPherson
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Some filters use interfaces from the windows media sdk instead of those from
direct show. These interfaces aren't required for playback, but can provide
better feedback about the current media than would otherwise be available.
Reviewed-by: Justin McPherson
|
| | | | | | | | |/
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
It's unnecessary and not supported on all compilers.
Reviewed-by: Justin McPherson
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Dmytro Poplavskiy
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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:
|