janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

qt-defs.mk: Add support for Qt 4 back

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-09-05 13:17:05 +00:00
commit 27cc4a49a8
1 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
make/qt-defs.mk
View file

@ -9,7 +9,6 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//') #QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
#endif #endif
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1) #QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
#CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# #
#ifeq ($(QT_MAJOR_VERSION),2) #ifeq ($(QT_MAJOR_VERSION),2)
# QT_PREFIX ?= /usr/lib/qt2 # QT_PREFIX ?= /usr/lib/qt2
@ -67,6 +66,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#Qt5Designer \ #Qt5Designer \
ifeq ($(QT_MAJOR_VERSION),5)
QT_MODULES = \ QT_MODULES = \
Qt5Concurrent \ Qt5Concurrent \
Qt5Core \ Qt5Core \
@ -92,6 +92,31 @@ QT_MODULES = \
Qt5X11Extras \ Qt5X11Extras \
Qt5XmlPatterns \ Qt5XmlPatterns \
Qt5Xml Qt5Xml
else
QT_MODULES = \
Qt3Support \
QtCLucene \
QtCore \
QtDBus \
QtDeclarative \
QtDesignerComponents \
QtDesigner \
QtGui \
QtHelp \
QtMultimedia \
QtNetwork \
QtOpenGL \
QtScript \
QtScriptTools \
QtSql \
QtSvg \
QtTest \
QtUiTools \
QtWebKit \
QtXmlPatterns \
QtXml
endif
QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES)) QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
MOC ?= $(QT_BIN_PREFIX)/bin/moc MOC ?= $(QT_BIN_PREFIX)/bin/moc
@ -99,6 +124,7 @@ UIC ?= $(QT_BIN_PREFIX)/bin/uic
RCC ?= $(QT_BIN_PREFIX)/bin/rcc RCC ?= $(QT_BIN_PREFIX)/bin/rcc
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- ytools defs # ------------------------------- ytools defs