diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -385,13 +385,7 @@ endif QT_QMAKE_FOUND := $(shell command -v qmake 2> /dev/null) ifdef QT_QMAKE_FOUND export QT_INSTALL_DOCS = $(shell qmake -query QT_INSTALL_DOCS) - ifeq ($(shell qmake -query QT_VERSION | head -c1), 4) - QT_ROOT_PATH = build/qt4-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) - WITH_QT_4=1 - else - QT_ROOT_PATH = build/qt-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) - WITH_QT_4=0 - endif + QT_ROOT_PATH = build/qt-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) endif export QT_OUTPUT_PATH = $(QT_ROOT_PATH)/$(BUILDTYPE) @@ -408,7 +402,6 @@ $(QT_BUILD): $(BUILD_DEPS) -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) @@ -424,7 +417,6 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) @@ -453,7 +445,6 @@ $(QNX_QT_BUILD): $(BUILD_DEPS) -DMBGL_PLATFORM=qt \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) |