diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:31:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:50:18 +0000 |
| commit | 3ef3e5b1019cd727ec9ca5a16c7615b016db19ea (patch) | |
| tree | fd7f0fe6d640bca1664e6d88b774ab3bc445fe70 /src/plugins | |
| parent | 3408abef86f49b0d2bd5de7f8dcf24a125166242 (diff) | |
| download | qtmultimedia-3ef3e5b1019cd727ec9ca5a16c7615b016db19ea.tar.gz | |
remove redundant statements from project files
- TARGET is unnecessary if it matches the project file's basename
- CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf
- load(qt_build_config) is done by .qmake.conf
Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 1 | ||||
| -rw-r--r-- | src/plugins/gstreamer/common.pri | 1 | ||||
| -rw-r--r-- | src/plugins/qnx-audio/audio/audio.pro | 3 | ||||
| -rw-r--r-- | src/plugins/resourcepolicy/resourcepolicy.pro | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index ff9e5bca9..bca16f48d 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -1,4 +1,3 @@ -load(qt_build_config) #DEFINES += QT_DEBUG_AVF # Avoid clash with a variable named `slots' in a Quartz header diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index eb6a29987..babdb7cfb 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -1,6 +1,5 @@ QT += core-private multimedia-private network -CONFIG += no_private_qt_headers_warning qtHaveModule(widgets) { QT += widgets multimediawidgets-private diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro index bf4300a71..bd69dfe1e 100644 --- a/src/plugins/qnx-audio/audio/audio.pro +++ b/src/plugins/qnx-audio/audio/audio.pro @@ -1,7 +1,6 @@ TARGET = qtmedia_qnx_audio -QT += multimedia-private -CONFIG += no_private_qt_headers_warning +QT += multimedia-private LIBS += -lasound diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro index e333bac09..91a946665 100644 --- a/src/plugins/resourcepolicy/resourcepolicy.pro +++ b/src/plugins/resourcepolicy/resourcepolicy.pro @@ -1,7 +1,7 @@ TARGET = resourceqt QT += multimedia-private -CONFIG += no_private_qt_headers_warning link_pkgconfig +CONFIG += link_pkgconfig PKGCONFIG += libresourceqt5 INCLUDEPATH += $$PWD \ |