mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
Merge pull request #319 from bekcpear/fix-equals-6.4.0-block
fix qmake build
This commit is contained in:
commit
bc2a64f94c
|
@ -62,6 +62,11 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
|
|||
DEFINES += MAKE_FFMPEG_PLAYER
|
||||
}
|
||||
|
||||
contains(DEFINES, MAKE_QTMULTIMEDIA_PLAYER|MAKE_FFMPEG_PLAYER) {
|
||||
HEADERS += audiooutput.h
|
||||
SOURCES += audiooutput.cpp
|
||||
}
|
||||
|
||||
# on windows platform ,only works in release build
|
||||
CONFIG( use_xapian ) {
|
||||
DEFINES += USE_XAPIAN
|
||||
|
@ -267,7 +272,6 @@ HEADERS += folding.hh \
|
|||
ankiconnector.h \
|
||||
article_inspect.h \
|
||||
articlewebpage.h \
|
||||
audiooutput.h \
|
||||
base/globalregex.hh \
|
||||
base_type.h \
|
||||
globalbroadcaster.h \
|
||||
|
@ -413,7 +417,6 @@ SOURCES += folding.cc \
|
|||
ankiconnector.cpp \
|
||||
article_inspect.cpp \
|
||||
articlewebpage.cpp \
|
||||
audiooutput.cpp \
|
||||
base/globalregex.cc \
|
||||
globalbroadcaster.cpp \
|
||||
headwordsmodel.cpp \
|
||||
|
@ -673,8 +676,7 @@ TS_OUT = $$TRANSLATIONS
|
|||
TS_OUT ~= s/.ts/.qm/g
|
||||
PRE_TARGETDEPS += $$TS_OUT
|
||||
|
||||
equals(QT_VERSION,6.4.0)
|
||||
{
|
||||
equals(QT_VERSION,6.4.0) {
|
||||
#QTBUG-105984
|
||||
multimedia.files = $$[QT_PLUGIN_PATH]/multimedia/*
|
||||
multimedia.path = plugins/multimedia
|
||||
|
|
Loading…
Reference in a new issue