Browse Source

Fix build on archlinux when qt4 and qt5 are both installed

tags/1.9.4
falkTX 12 years ago
parent
commit
f4f618484d
1 changed files with 10 additions and 3 deletions
  1. +10
    -3
      source/Makefile.mk

+ 10
- 3
source/Makefile.mk View File

@@ -377,9 +377,16 @@ UIC_QT4 ?= $(shell pkg-config --variable=uic_location QtCore)
endif

ifeq ($(HAVE_QT5),true)
MOC_QT5 ?= $(shell pkg-config --variable=libdir Qt5Core)/qt5/bin/moc
RCC_QT5 ?= $(shell pkg-config --variable=libdir Qt5Core)/qt5/bin/rcc
UIC_QT5 ?= $(shell pkg-config --variable=libdir Qt5Core)/qt5/bin/uic
QT5_LIBDIR = $(shell pkg-config --variable=libdir Qt5Core)
ifneq (,$(wildcard $(QT5_LIBDIR)/qt5/bin/moc))
MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc
UIC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/uic
else
MOC_QT5 ?= $(QT5_LIBDIR)/qt/bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc
UIC_QT5 ?= $(QT5_LIBDIR)/qt/bin/uic
endif
endif

# --------------------------------------------------------------

Loading…
Cancel
Save