From e791e4f0e9d51e25d1cc547e8b48771008831099 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Feb 2012 17:34:53 +0100 Subject: clean up qmake-generated projects remove assignmets which are defaults or bogus Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64 Reviewed-by: Marius Storm-Olsen Reviewed-by: Michael Goddard --- config.tests/directshow/directshow.pro | 3 --- config.tests/evr/evr.pro | 2 -- config.tests/gstreamer/gstreamer.pro | 5 ----- config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 5 ----- config.tests/gstreamer_photography/gstreamer_photography.pro | 5 ----- config.tests/resourcepolicy/resourcepolicy.pro | 5 ----- config.tests/wmf/wmf.pro | 4 ---- config.tests/wmp/wmp.pro | 3 --- config.tests/wmsdk/wmsdk.pro | 2 -- config.tests/xvideo/xvideo.pro | 6 ------ examples/declarative-radio/declarative-radio.pro | 6 ------ src/plugins/audiocapture/audiocapture.pro | 1 - src/plugins/gstreamer/gstreamer.pro | 1 - src/plugins/pulseaudio/pulseaudio.pro | 1 - 14 files changed, 49 deletions(-) diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro index 0ad9cb763..bbf88043d 100644 --- a/config.tests/directshow/directshow.pro +++ b/config.tests/directshow/directshow.pro @@ -1,11 +1,8 @@ CONFIG -= qt CONFIG += console -TEMPLATE = app requires(win32*) -# Input SOURCES += main.cpp LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 - diff --git a/config.tests/evr/evr.pro b/config.tests/evr/evr.pro index c15b6c8c4..54cf30f1b 100644 --- a/config.tests/evr/evr.pro +++ b/config.tests/evr/evr.pro @@ -1,8 +1,6 @@ CONFIG -= qt CONFIG += console -TEMPLATE = app requires(win32*) -# Input SOURCES += main.cpp diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro index 5fcd1ab79..5076db083 100644 --- a/config.tests/gstreamer/gstreamer.pro +++ b/config.tests/gstreamer/gstreamer.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - requires(unix) -# Input SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro index b0a6efc01..2d77a00b5 100644 --- a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro +++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - requires(unix) -# Input SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro index 3b384b096..951e0abcb 100644 --- a/config.tests/gstreamer_photography/gstreamer_photography.pro +++ b/config.tests/gstreamer_photography/gstreamer_photography.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - requires(unix) -# Input SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/resourcepolicy/resourcepolicy.pro b/config.tests/resourcepolicy/resourcepolicy.pro index 79fa6a14b..4b4b3c8f4 100644 --- a/config.tests/resourcepolicy/resourcepolicy.pro +++ b/config.tests/resourcepolicy/resourcepolicy.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - requires(unix) -# Input SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/wmf/wmf.pro b/config.tests/wmf/wmf.pro index 31b532843..ac5643e4f 100644 --- a/config.tests/wmf/wmf.pro +++ b/config.tests/wmf/wmf.pro @@ -1,10 +1,6 @@ CONFIG -= qt CONFIG += console -TEMPLATE = app -# Input SOURCES += main.cpp LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 -lMf -lMfuuid -lMfplat -lPropsys - - diff --git a/config.tests/wmp/wmp.pro b/config.tests/wmp/wmp.pro index 4c2f1578b..dc6a9cec4 100644 --- a/config.tests/wmp/wmp.pro +++ b/config.tests/wmp/wmp.pro @@ -1,11 +1,8 @@ CONFIG -= qt CONFIG += console -TEMPLATE = app requires(win32*) -# Input SOURCES += main.cpp LIBS += -lstrmiids -lole32 -lOleaut32 -luser32 -lgdi32 - diff --git a/config.tests/wmsdk/wmsdk.pro b/config.tests/wmsdk/wmsdk.pro index c15b6c8c4..54cf30f1b 100644 --- a/config.tests/wmsdk/wmsdk.pro +++ b/config.tests/wmsdk/wmsdk.pro @@ -1,8 +1,6 @@ CONFIG -= qt CONFIG += console -TEMPLATE = app requires(win32*) -# Input SOURCES += main.cpp diff --git a/config.tests/xvideo/xvideo.pro b/config.tests/xvideo/xvideo.pro index 749091eba..056dd0a33 100644 --- a/config.tests/xvideo/xvideo.pro +++ b/config.tests/xvideo/xvideo.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - requires(unix) -# Input SOURCES += main.cpp CONFIG += link_pkgconfig @@ -13,4 +8,3 @@ PKGCONFIG += \ x11 \ xext \ xv - diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro index 313bdbfe3..748342766 100644 --- a/examples/declarative-radio/declarative-radio.pro +++ b/examples/declarative-radio/declarative-radio.pro @@ -1,10 +1,4 @@ -TEMPLATE = app -TARGET = declarative-radio -DEPENDPATH += . -INCLUDEPATH += . QT += declarative quick multimedia -# Input SOURCES += main.cpp RESOURCES += declarative-radio.qrc - diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index 8b30b2aa7..f7091c5db 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -7,7 +7,6 @@ PLUGIN_TYPE=mediaservice load(qt_plugin) DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} -# Input HEADERS += audioencodercontrol.h \ audiocontainercontrol.h \ audiomediarecordercontrol.h \ diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 77f7da9c0..7c40759d2 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -53,7 +53,6 @@ maemo6 { } } -# Input HEADERS += \ qgstreamervideorendererinterface.h \ qgstreamerserviceplugin.h \ diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index 9b786b43d..0897b8ff7 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -10,7 +10,6 @@ DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} CONFIG += link_pkgconfig PKGCONFIG += libpulse -# Input HEADERS += qpulseaudioplugin.h \ qaudiodeviceinfo_pulse.h \ qaudiooutput_pulse.h \ -- cgit v1.2.3