mirror of https://git.wownero.com/dsc/mxe.git
qtserialport_qt4: fix for Qt4 support in separate branch
This commit is contained in:
parent
fb96d34daf
commit
fcc6023d34
|
@ -1,31 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From c68b55c600c04a42bdd31e869b1a28d90868c2aa Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Sat, 27 Sep 2014 15:46:52 -0700
|
||||
Subject: [PATCH] Work-around qmake bundled with Qt 4 not supporting macro
|
||||
expansion
|
||||
|
||||
---
|
||||
src/serialport/serialport.pro | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro
|
||||
index feb6e9c..6500ca7 100644
|
||||
--- a/src/serialport/serialport.pro
|
||||
+++ b/src/serialport/serialport.pro
|
||||
@@ -14,6 +14,10 @@ greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
include($$PWD/qt4support/install-helper.pri)
|
||||
CONFIG += module create_prl
|
||||
mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET
|
||||
+ load(moc)
|
||||
+ # qmake bundled with Qt 4 doesn't support macro expansion.
|
||||
+ # Work around it here.
|
||||
+ QMAKE_MOC = $$QMAKE_MOC -DQT_DEPRECATED_SINCE=1
|
||||
}
|
||||
|
||||
PRECOMPILED_HEADER =
|
||||
--
|
||||
1.8.3.2
|
||||
|
|
@ -3,16 +3,17 @@
|
|||
|
||||
PKG := qtserialport_qt4
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtserialport_VERSION)
|
||||
$(PKG)_CHECKSUM = $(qtserialport_CHECKSUM)
|
||||
$(PKG)_SUBDIR = $(qtserialport_SUBDIR)
|
||||
$(PKG)_FILE = $(qtserialport_FILE)
|
||||
$(PKG)_URL = $(qtserialport_URL)
|
||||
$(PKG)_VERSION := 5c3b6cc770
|
||||
$(PKG)_CHECKSUM := 355d6aaf36726c040d21dae4fc478f3af7af0268
|
||||
$(PKG)_GH_USER := qtproject
|
||||
$(PKG)_GH_REPO := qtserialport
|
||||
$(PKG)_GH_TREE := qt4-dev
|
||||
$(PKG)_SUBDIR := $($(PKG)_GH_USER)-$($(PKG)_GH_REPO)-$(call substr,$($(PKG)_VERSION),1,7)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := https://github.com/$($(PKG)_GH_USER)/$($(PKG)_GH_REPO)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc qt
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
echo $(qtserialport_VERSION)
|
||||
endef
|
||||
$(PKG)_UPDATE := $(call MXE_GET_GITHUB_SHA, $($(PKG)_GH_USER)/$($(PKG)_GH_REPO), $($(PKG)_GH_TREE))
|
||||
|
||||
define $(PKG)_BUILD_SHARED
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt/bin/qmake'
|
||||
|
|
Loading…
Reference in New Issue