diff --git a/make/qt-defs.mk b/make/qt-defs.mk index dde2baa0..f71d39b0 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -9,7 +9,6 @@ CPPFLAGS += -DQT_THREAD_SUPPORT #QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//') #endif #QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1) -#CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) # #ifeq ($(QT_MAJOR_VERSION),2) # QT_PREFIX ?= /usr/lib/qt2 @@ -67,6 +66,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT #Qt5Designer \ +ifeq ($(QT_MAJOR_VERSION),5) QT_MODULES = \ Qt5Concurrent \ Qt5Core \ @@ -92,6 +92,31 @@ QT_MODULES = \ Qt5X11Extras \ Qt5XmlPatterns \ 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)) MOC ?= $(QT_BIN_PREFIX)/bin/moc @@ -99,6 +124,7 @@ UIC ?= $(QT_BIN_PREFIX)/bin/uic RCC ?= $(QT_BIN_PREFIX)/bin/rcc LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) +CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) # ------------------------------- ytools defs