diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
| commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
| tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /qtmultimediakit.pro | |
| parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.
Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'qtmultimediakit.pro')
| -rw-r--r-- | qtmultimediakit.pro | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/qtmultimediakit.pro b/qtmultimediakit.pro index 54eb4058a..55aa22007 100644 --- a/qtmultimediakit.pro +++ b/qtmultimediakit.pro @@ -1,21 +1,4 @@ -TEMPLATE = subdirs - -module_qtmultimediakit_src.subdir = src -module_qtmultimediakit_src.target = module-qtmultimediakit-src - -module_qtmultimediakit_examples.subdir = examples -module_qtmultimediakit_examples.target = module-qtmultimediakit-examples -module_qtmultimediakit_examples.depends = module_qtmultimediakit_src -!contains(QT_BUILD_PARTS,examples) { - module_qtmultimediakit_examples.CONFIG = no_default_target no_default_install -} - -module_qtmultimediakit_tests.subdir = tests -module_qtmultimediakit_tests.target = module-qtmultimediakit-tests -module_qtmultimediakit_tests.depends = module_qtmultimediakit_src -module_qtmultimediakit_tests.CONFIG = no_default_target no_default_install - -SUBDIRS += module_qtmultimediakit_src \ - module_qtmultimediakit_examples \ - module_qtmultimediakit_tests \ +# This is only so that Qt5.git still builds, since it's expecting +# the .pro file to match the directory name +include(qtmultimedia.pro) |