From 3d49f74c7f4420c14a9f607a33a354d7c58bb66f Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Thu, 7 Nov 2019 16:06:37 +0000 Subject: [PATCH 1/6] cleanup: remove QMAKE_COPY_DIR directive from mythplugins --- mythplugins/mytharchive/mytharchive/mytharchive.pro | 3 --- mythplugins/mytharchive/theme/theme.pro | 2 -- mythplugins/mythbrowser/theme/theme.pro | 2 -- mythplugins/mythgame/theme/theme.pro | 2 -- mythplugins/mythmusic/theme/theme.pro | 2 -- mythplugins/mythnetvision/theme/theme.pro | 2 -- mythplugins/mythnews/theme/theme.pro | 2 -- mythplugins/mythweather/mythweather/mythweather.pro | 3 --- mythplugins/mythweather/theme/theme.pro | 2 -- mythplugins/mythzoneminder/theme/theme.pro | 2 -- 10 files changed, 22 deletions(-) diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro index 3c27a9dd95..be276301f3 100644 --- a/mythplugins/mytharchive/mytharchive/mytharchive.pro +++ b/mythplugins/mytharchive/mytharchive/mytharchive.pro @@ -2,9 +2,6 @@ include ( ../../mythconfig.mak ) include ( ../../settings.pro ) include ( ../../programs-libs.pro ) -QMAKE_COPY_DIR = sh ../../cpsvndir -win32:QMAKE_COPY_DIR = sh ../../cpsimple - INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libavformat INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libswscale DEPENDPATH *= $${INCLUDEPATH} diff --git a/mythplugins/mytharchive/theme/theme.pro b/mythplugins/mytharchive/theme/theme.pro index 529d1328da..fd6bdd7896 100644 --- a/mythplugins/mytharchive/theme/theme.pro +++ b/mythplugins/mytharchive/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png diff --git a/mythplugins/mythbrowser/theme/theme.pro b/mythplugins/mythbrowser/theme/theme.pro index 425a5249be..5dc9cc2295 100644 --- a/mythplugins/mythbrowser/theme/theme.pro +++ b/mythplugins/mythbrowser/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png diff --git a/mythplugins/mythgame/theme/theme.pro b/mythplugins/mythgame/theme/theme.pro index 529d1328da..fd6bdd7896 100644 --- a/mythplugins/mythgame/theme/theme.pro +++ b/mythplugins/mythgame/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png diff --git a/mythplugins/mythmusic/theme/theme.pro b/mythplugins/mythmusic/theme/theme.pro index fef185d6c5..e6b28af681 100644 --- a/mythplugins/mythmusic/theme/theme.pro +++ b/mythplugins/mythmusic/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png diff --git a/mythplugins/mythnetvision/theme/theme.pro b/mythplugins/mythnetvision/theme/theme.pro index 0ea2b25949..60b94ff938 100644 --- a/mythplugins/mythnetvision/theme/theme.pro +++ b/mythplugins/mythnetvision/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml diff --git a/mythplugins/mythnews/theme/theme.pro b/mythplugins/mythnews/theme/theme.pro index d0f9d0a166..244ca7cfe4 100644 --- a/mythplugins/mythnews/theme/theme.pro +++ b/mythplugins/mythnews/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png diff --git a/mythplugins/mythweather/mythweather/mythweather.pro b/mythplugins/mythweather/mythweather/mythweather.pro index af44d914d7..d754ac2063 100644 --- a/mythplugins/mythweather/mythweather/mythweather.pro +++ b/mythplugins/mythweather/mythweather/mythweather.pro @@ -10,9 +10,6 @@ TARGET = mythweather target.path = $${LIBDIR}/mythtv/plugins INSTALLS += target -QMAKE_COPY_DIR = sh ../../cpsvndir -win32:QMAKE_COPY_DIR = sh ../../cpsimple - INCLUDEPATH += $${PREFIX}/include/mythtv INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui diff --git a/mythplugins/mythweather/theme/theme.pro b/mythplugins/mythweather/theme/theme.pro index 54d4a5ff58..d72b0b025c 100644 --- a/mythplugins/mythweather/theme/theme.pro +++ b/mythplugins/mythweather/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png default/icons/*.png diff --git a/mythplugins/mythzoneminder/theme/theme.pro b/mythplugins/mythzoneminder/theme/theme.pro index d0f9d0a166..244ca7cfe4 100644 --- a/mythplugins/mythzoneminder/theme/theme.pro +++ b/mythplugins/mythzoneminder/theme/theme.pro @@ -7,8 +7,6 @@ TARGET = themenop TEMPLATE = app CONFIG -= qt moc -QMAKE_COPY_DIR = sh ../../cpsvndir - defaultfiles.path = $${PREFIX}/share/mythtv/themes/default defaultfiles.files = default/*.xml default/images/*.png -- 2.23.0