Fixed new implementation of Qt bindings for Qt5

This commit is contained in:
Matthias Koefferlein
2017-02-22 22:34:26 +01:00
parent 0c89999705
commit d66291af5b
16 changed files with 59 additions and 883 deletions
+16 -12
View File
@@ -276,18 +276,22 @@ INCLUDEPATH += ../tl ../gsi ../db ../rdb
DEPENDPATH += ../tl ../gsi ../db ../rdb
LIBS += -L$$DESTDIR -ltl -lgsi -ldb -lrdb
equals(HAVE_QTBINDINGS, "1") {
equals(HAVE_QT5, "1") {
INCLUDEPATH += ../gsiqt5
DEPENDPATH += ../gsiqt5
LIBS += -lgsiqt5
} else {
INCLUDEPATH += ../gsiqt
DEPENDPATH += ../gsiqt
LIBS += -lgsiqt
}
# for gsiQtExternals.h:
equals(HAVE_QT5, "1") {
INCLUDEPATH += ../gsiqt5
DEPENDPATH += ../gsiqt5
} else {
INCLUDEPATH += ../gsiqtstub
DEPENDPATH += ../gsiqtstub
INCLUDEPATH += ../gsiqt
DEPENDPATH += ../gsiqt
}
equals(HAVE_QTBINDINGS, "1") {
INCLUDEPATH += ../gsiqt_common
DEPENDPATH += ../gsiqt_common
equals(HAVE_QT5, "1") {
LIBS += -lgsiqt5
} else {
LIBS += -lgsiqt
}
}