Skip to content

Commit

Permalink
Handle QT widget and dbus changes in .pro for Qt5.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-kristjansson committed Dec 20, 2012
1 parent e8d5fe5 commit ffbbf7f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 8 additions & 1 deletion mythtv/libs/libmyth/libmyth.pro
Expand Up @@ -9,6 +9,9 @@ DEFINES += MYTH_API


QT += network xml sql script
contains(QT_VERSION, ^5\\.[0-9]\\..*) {
QT += widgets
}

QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)

Expand Down Expand Up @@ -142,7 +145,11 @@ using_pulse {
unix:!cygwin {
SOURCES += mediamonitor-unix.cpp
HEADERS += mediamonitor-unix.h
using_qtdbus: CONFIG += qdbus
contains(QT_VERSION, ^5\\.[0-9]\\..*) {
using_qtdbus: QT += dbus
} else {
using_qtdbus: CONFIG += qdbus
}
}

linux:DEFINES += linux
Expand Down
4 changes: 4 additions & 0 deletions mythtv/libs/libmythbase/libmythbase.pro
Expand Up @@ -124,6 +124,10 @@ mingw:LIBS += -lws2_32

QT += xml sql network

contains(QT_VERSION, ^5\\.[0-9]\\..*) {
QT += widgets
}

include ( ../libs-targetfix.pro )

LIBS += $$EXTRA_LIBS $$LATE_LIBS

0 comments on commit ffbbf7f

Please sign in to comment.