Merge pull request #260 from mabrand/use-qtbase

qt5 packages: use qtbase variables

15 files changed, 60 insertions, 60 deletions

diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 4becb7f..1627a16 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtactiveqt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 105c9966e9fa289c157e04c18204b48df0ed120d
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtactiveqt,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 1e17e4b..e0597cd 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtdeclarative
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 52108058b7fb61c20ef3fa7aab81c19381e714a0
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtdeclarative,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qtjsbackend qtsvg qtxmlpatterns
 
 define $(PKG)_UPDATE
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index bee63b0..bb31588 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtgraphicaleffects
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 031c50a6e2ab62fce74b57ae230855cbbc9e9056
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qtdeclarative
 
 define $(PKG)_UPDATE
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 6f6f695..7720115 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtimageformats
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := a524ff862f1d5490191a56aa88f3bc911716d866
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase libmng tiff
 
 define $(PKG)_UPDATE
diff --git a/src/qtjsbackend.mk b/src/qtjsbackend.mk
index 4a302b4..ff24366 100644
--- a/src/qtjsbackend.mk
+++ b/src/qtjsbackend.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtjsbackend
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := e13a5ef112bdbe2fb1691d21c52b287a21da614a
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtjsbackend,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtjsbackend,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtjsbackend,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index 60d08d8..a7e33ab 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtmultimedia
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := bae589a9749d388b2503ad3174c7ac9b3baa0b2b
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtmultimedia,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 3e4e42f..9b925df 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtquick1
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 75e07675a9edf5bb096953e1f7646ff1af405dad
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtquick1,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtquick1,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qtscript qtsvg qttools qtxmlpatterns
 
 define $(PKG)_UPDATE
diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk
index cff1174..5fc224c 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtquickcontrols
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := e92d5a505dcb1ba699bc53358246bdd52873e164
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtquickcontrols,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qtdeclarative
 
 define $(PKG)_UPDATE
diff --git a/src/qtscript.mk b/src/qtscript.mk
index 20d4329..763354c 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtscript
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 972e16e91bb470e732716ca7dc18890ff5db6fd5
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtscript,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtscript,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtsensors.mk b/src/qtsensors.mk
index 1488ef6..7ee7d54 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtsensors
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 7750d4f9220dcf042ba578971c0312de1e71ad7c
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtsensors,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtsensors,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtserialport.mk b/src/qtserialport.mk
index cce2bed..fcce0a1 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtserialport
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := a1a02801662c441d25299615bd5188473a67e7de
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtserialport,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtserialport,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index cc1d853..5cf49a7 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtsvg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 33fa0f432e66a84a5abfcd6a39e2a1fb1ed0ee03
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qttools.mk b/src/qttools.mk
index c613466..7484837 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -3,11 +3,11 @@
 
 PKG             := qttools
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 36ec1deb86c1669043349056d7c3e44b9424ce7a
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qtactiveqt qtdeclarative
 
 define $(PKG)_UPDATE
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index 9d674e4..460608d 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -3,11 +3,11 @@
 
 PKG             := qttranslations
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 1561d8495aa29003240819a8cf6d7a64ff96a9b7
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qttranslations,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qttranslations,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase qttools
 
 define $(PKG)_UPDATE
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 47acff6..28cea0d 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -3,11 +3,11 @@
 
 PKG             := qtxmlpatterns
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.1
+$(PKG)_VERSION   = $(qtbase_VERSION)
 $(PKG)_CHECKSUM := 69f7f46f0072a35e67e820a3561b852b497a9d8f
-$(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_SUBDIR    = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
+$(PKG)_FILE      = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
+$(PKG)_URL       = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE