diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 11:07:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 09:50:37 +0200 |
commit | c495dfe142d0c421ba672ee124fd4358251d232d (patch) | |
tree | ddb8c3303cb87f5fade35f6298ffe11c7474c91a /src | |
parent | 5705f70da1e0a4a8838f9c4dfda1e847807d0ebe (diff) |
auto-generate module pris
Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/multimedia.pro | 1 | ||||
-rw-r--r-- | src/multimediawidgets/multimediawidgets.pro | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 82b58e9f4..d43af113b 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -5,7 +5,6 @@ QPRO_PWD = $$PWD QT = core-private network gui CONFIG += module -MODULE_PRI += ../../modules/qt_multimedia.pri contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { } else { diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index c130bc846..10d8b7458 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -6,8 +6,10 @@ QPRO_PWD = $$PWD QT = core gui multimedia-private widgets-private CONFIG += module no_private_qt_headers_warning -MODULE_PRI += ../../modules/qt_multimediawidgets.pri +load(qt_module_config) + +# private dependencies contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { QT += opengl } else { @@ -17,8 +19,6 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { !static:DEFINES += QT_MAKEDLL DEFINES += QT_BUILD_MULTIMEDIAWIDGETS_LIB -load(qt_module_config) - PRIVATE_HEADERS += \ qvideowidget_p.h \ qpaintervideosurface_p.h \ |