Commit Graph

1025 Commits

Author SHA1 Message Date
Qt Continuous Integration System
40c5ec7297 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Squashed commit of changes from the 4.8-temp branch.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
2011-05-23 22:51:34 +10:00
David Boddie
add475cbc1 Squashed commit of changes from the 4.8-temp branch. 2011-05-20 19:48:33 +02:00
David Boddie
c5c9450497 Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
2011-05-19 20:48:28 +02:00
Qt Continuous Integration System
eb15d0e412 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Don't build and install examples and demos unless requested
2011-05-14 16:57:26 +10:00
Eckhart Koppen
0db79fb534 Don't build and install examples and demos unless requested
Take -nomake setting into account when building
2011-05-14 09:53:47 +03:00
Qt Continuous Integration System
0671bdf04b Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Update module version number to 5.0.0
2011-05-13 22:59:37 +10:00
Eckhart Koppen
418b33b944 Update module version number to 5.0.0
Updated .pri file variables
2011-05-13 13:33:43 +03:00
Qt Continuous Integration System
45bf616061 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  tests: build autotests by default for qtmultimedia
2011-05-12 12:36:50 +10:00
Rohan McGovern
a612c40d2e tests: build autotests by default for qtmultimedia
Configure Qt with `-nomake tests' if you don't want the tests.

Reviewed-by: Jason McDonald
Change-Id: I1c17d4a9c1a5c97362dc604f5a3686af4f59c729
2011-05-12 12:33:00 +10:00
Qt Continuous Integration System
306424c55f Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Add QTMULTIMEDIA_VERSION macro for qtmultimedia
2011-05-11 20:59:54 +10:00
Liang Qi
95b597c7e1 Add QTMULTIMEDIA_VERSION macro for qtmultimedia
Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
2011-05-11 12:46:58 +02:00
Qt Continuous Integration System
aca1b2be8e Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Added .tag file with Git revision.
  Use private headers
  Add module.prf, and install MODULE_PRI for each module
2011-05-05 14:33:58 +10:00
axis
11999724f0 Added .tag file with Git revision. 2011-05-03 16:23:51 +02:00
Marius Storm-Olsen
a9f96c8d71 Use private headers 2011-05-02 15:30:43 +02:00
Marius Storm-Olsen
0710f1743d Add module.prf, and install MODULE_PRI for each module
Output warning if not present
2011-05-02 15:30:43 +02:00
axis
89d67a2b80 Added dependency information to the sync.profile. 2011-04-27 12:35:15 +02:00
axis
3a898d2aba Add .gitignore to each module 2011-04-27 12:06:07 +02:00
Liang Qi
bfacf93b22 Add tst_headersclean for each module 2011-04-27 12:06:03 +02:00
Liang Qi
bebfbefe38 Modularized tst_compilerwarnings 2011-04-27 12:06:03 +02:00
Liang Qi
85650c72a8 Modularized tst_bic and add some helper functions for global test 2011-04-27 12:06:03 +02:00
axis
4f5fbb7b93 Introduced the QT.<module>.plugins variable to module profiles. 2011-04-27 12:06:02 +02:00
axis
dd349b76cd Added QT.<module>.imports support to module profiles. 2011-04-27 12:06:00 +02:00
Olivier Goffart
4a85fc5d21 qtmultimedia profiles 2011-04-27 12:05:55 +02:00
axis
d41e0c05c4 Moved to using a feature profile instead of direct inclusion. 2011-04-27 12:05:43 +02:00
Qt by Nokia
60941c2741 Initial import from the monolithic Qt.
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 12:05:43 +02:00