Attachment #542902 for bug #658534

Lines 3-9 Link Here

(-)a/programs/mythwelcome/mythwelcome.pro (-1 / +1 lines)
3	include (../programs-libs.pro)	3	include (../programs-libs.pro)
4		4
5	QT += xml sql network	5	QT += xml sql network
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythutil/mythutil.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network sql xml	5	QT += network sql xml
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythtv-setup/mythtv-setup.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network xml sql	5	QT += network xml sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythtranscode/mythtranscode.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro)	3	include ( ../programs-libs.pro)
4		4
5	QT += network xml sql	5	QT += network xml sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythscreenwizard/mythscreenwizard.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro)	3	include ( ../programs-libs.pro)
4		4
5	QT += sql network	5	QT += sql network
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythpreviewgen/mythpreviewgen.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network sql	5	QT += network sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythmediaserver/mythmediaserver.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network sql	5	QT += network sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 2-8 Link Here

(-)a/programs/mythlogserver/mythlogserver.pro (-1 / +1 lines)
2	include ( ../programs-libs.pro )	2	include ( ../programs-libs.pro )
3		3
4	QT += sql network	4	QT += sql network
5	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
6	QT += widgets	6	QT += widgets
7	}	7	}
8		8

Lines 3-9 Link Here

(-)a/programs/mythlcdserver/mythlcdserver.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network xml sql	5	QT += network xml sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9	using_opengl:QT += opengl	9	using_opengl:QT += opengl

Lines 3-9 Link Here

(-)a/programs/mythjobqueue/mythjobqueue.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro)	3	include ( ../programs-libs.pro)
4		4
5	QT += sql network	5	QT += sql network
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 11-17 Link Here

(-)a/programs/mythfrontend/mythfrontend.pro (-1 / +1 lines)
11	QT += webkit	11	QT += webkit
12	using_qtdbus: CONFIG += qdbus	12	using_qtdbus: CONFIG += qdbus
13	}	13	}
14	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	14	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
15	QT += widgets	15	QT += widgets
16	QT += webkitwidgets	16	QT += webkitwidgets
17	using_qtdbus: QT += dbus	17	using_qtdbus: QT += dbus

Lines 3-9 Link Here

(-)a/programs/mythfilldatabase/mythfilldatabase.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network xml sql	5	QT += network xml sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 3-9 Link Here

(-)a/programs/mythfilerecorder/mythfilerecorder.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network xml sql script	5	QT += network xml sql script
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 2-8 Link Here

(-)a/programs/mythcommflag/mythcommflag.pro (-1 / +1 lines)
2	include (../../version.pro)	2	include (../../version.pro)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
6	QT += widgets	6	QT += widgets
7	}	7	}
8		8

Lines 2-8 Link Here

(-)a/programs/mythccextractor/mythccextractor.pro (-1 / +1 lines)
2	include ( ../programs-libs.pro )	2	include ( ../programs-libs.pro )
3		3
4	QT += sql network	4	QT += sql network
5	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
6	QT += widgets	6	QT += widgets
7	}	7	}
8		8

Lines 10-16 Link Here

(-)a/programs/mythbackend/mythbackend.pro (-1 / +1 lines)
10	# need the following for QUrl::addQueryItem	10	# need the following for QUrl::addQueryItem
11	DEFINES += QT_DISABLE_DEPRECATED_BEFORE	11	DEFINES += QT_DISABLE_DEPRECATED_BEFORE
12	}	12	}
13	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	13	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
14	QT += widgets	14	QT += widgets
15	}	15	}
16		16

Lines 3-9 Link Here

(-)a/programs/mythavtest/mythavtest.pro (-1 / +1 lines)
3	include ( ../programs-libs.pro )	3	include ( ../programs-libs.pro )
4		4
5	QT += network xml sql	5	QT += network xml sql
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += widgets	7	QT += widgets
8	}	8	}
9		9

Lines 4-10 Link Here

(-)a/libs/libmythui/libmythui.pro (-1 / +1 lines)
4	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	4	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
5	QT += webkit	5	QT += webkit
6	}	6	}
7	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	7	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
8	QT += widgets	8	QT += widgets
9	QT += webkitwidgets	9	QT += webkitwidgets
10	android: QT += androidextras	10	android: QT += androidextras

Lines 1-7 Link Here

(-)a/libs/libmythtv/libmythtv.pro (-1 / +1 lines)
1	include ( ../../settings.pro )	1	include ( ../../settings.pro )
2		2
3	QT += network xml sql	3	QT += network xml sql
4	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	4	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
5	QT += widgets	5	QT += widgets
6	}	6	}
7		7

Lines 5-11 Link Here

(-)a/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmythtv/test/test_copyframes/test_copyframes.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 1-7 Link Here

(-)a/libs/libmythprotoserver/libmythprotoserver.pro (-1 / +1 lines)
1	include ( ../../settings.pro )	1	include ( ../../settings.pro )
2		2
3	QT += network sql	3	QT += network sql
4	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	4	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
5	QT += widgets	5	QT += widgets
6	}	6	}
7		7

Lines 1-7 Link Here

(-)a/libs/libmythmetadata/libmythmetadata.pro (-1 / +1 lines)
1	include ( ../../settings.pro )	1	include ( ../../settings.pro )
2		2
3	QT += network xml sql	3	QT += network xml sql
4	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	4	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
5	QT += widgets	5	QT += widgets
6	}	6	}
7		7

Lines 5-11 Link Here

(-)a/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 154-160 Link Here

(-)a/libs/libmythbase/libmythbase.pro (-1 / +1 lines)
154		154
155	QT += xml sql network	155	QT += xml sql network
156		156
157	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	157	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
158	QT += widgets	158	QT += widgets
159	}	159	}
160		160

Lines 5-11 Link Here

(-)a/libs/libmythbase/test/test_template/test_template.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 3-9 Link Here

(-)a/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro (-1 / +1 lines)
3	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	3	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
4	CONFIG += qtestlib	4	CONFIG += qtestlib
5	}	5	}
6	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	6	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
7	QT += testlib	7	QT += testlib
8	}	8	}
9		9

Lines 5-11 Link Here

(-)a/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 1-7 Link Here

(-)a/libs/libmyth/libmyth.pro (-2 / +2 lines)
1	include ( ../../settings.pro )	1	include ( ../../settings.pro )
2		2
3	QT += network xml sql script	3	QT += network xml sql script
4	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	4	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
5	QT += widgets	5	QT += widgets
6	android: QT += androidextras	6	android: QT += androidextras
7	}	7	}
Lines 169-175 Link Here
169	SOURCES += mediamonitor-unix.cpp	169	SOURCES += mediamonitor-unix.cpp
170	HEADERS += mediamonitor-unix.h	170	HEADERS += mediamonitor-unix.h
171	!android {	171	!android {
172	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	172	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
173	using_qtdbus: QT += dbus	173	using_qtdbus: QT += dbus
174	} else {	174	} else {
175	using_qtdbus: CONFIG += qdbus	175	using_qtdbus: CONFIG += qdbus

Lines 5-11 Link Here

(-)a/libs/libmyth/test/test_programinfo/test_programinfo.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmyth/test/test_audioutils/test_audioutils.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11

Lines 5-11 Link Here

(-)a/libs/libmyth/test/test_audioconvert/test_audioconvert.pro (-1 / +1 lines)
5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {	5	contains(QT_VERSION, ^4\\.[0-9]\\..*) {
6	CONFIG += qtestlib	6	CONFIG += qtestlib
7	}	7	}
8	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	8	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
9	QT += testlib	9	QT += testlib
10	}	10	}
11		11




    func=$4
    shift 4
    disable $cfg
    check_cmd $pkg_config --version
    err=$?
    if test "$err" = 0; then
        backup_cflags=$CFLAGS
        temp_extralibs=$($pkg_config --libs $pkg)
        add_cflags $($pkg_config --cflags $pkg)
        check_lib "$@" $header $func $temp_extralibs && enable $cfg
        CFLAGS=$backup_cflags
    fi

enabled pic && enable_weak_pic

is_qmake5(){
    $1 --version 2>&1 | egrep -q -e 'Qt version 5\.(([1-9][0-9]+)|[2-9])\.[0-9]'
}

# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake

EOF
done

check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType

enabled freetype2 ||
    die "ERROR! You must have FreeType installed to compile MythTV."

Return to bug 658534

Lines 1592-1603 Link Here

(-)a/configure (-5 / +5 lines)
1592	func=$4	1592	func=$4
1593	shift 4	1593	shift 4
1594	disable $cfg	1594	disable $cfg
1595	check_cmd ${pkg}-config --version	1595	check_cmd $pkg_config --version
1596	err=$?	1596	err=$?
1597	if test "$err" = 0; then	1597	if test "$err" = 0; then
1598	backup_cflags=$CFLAGS	1598	backup_cflags=$CFLAGS
1599	temp_extralibs=$(${pkg}-config --libs)	1599	temp_extralibs=$($pkg_config --libs $pkg)
1600	add_cflags $(${pkg}-config --cflags)	1600	add_cflags $($pkg_config --cflags $pkg)
1601	check_lib "$@" $header $func $temp_extralibs && enable $cfg	1601	check_lib "$@" $header $func $temp_extralibs && enable $cfg
1602	CFLAGS=$backup_cflags	1602	CFLAGS=$backup_cflags
1603	fi	1603	fi
Lines 5907-5913 Link Here
5907	enabled pic && enable_weak_pic	5907	enabled pic && enable_weak_pic
5908		5908
5909	is_qmake5(){	5909	is_qmake5(){
5910	$1 --version 2>&1 \| egrep -q -e "Qt version 5\.[2-9]\.[0-9]"	5910	$1 --version 2>&1 \| egrep -q -e 'Qt version 5\.(([1-9][0-9]+)\|[2-9])\.[0-9]'
5911	}	5911	}
5912		5912
5913	# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake	5913	# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
Lines 6902-6908 Link Here
6902	EOF	6902	EOF
6903	done	6903	done
6904		6904
6905	check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType	6905	check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType
6906		6906
6907	enabled freetype2 \|\|	6907	enabled freetype2 \|\|
6908	die "ERROR! You must have FreeType installed to compile MythTV."	6908	die "ERROR! You must have FreeType installed to compile MythTV."