From 14cc151f37a089784f8db162bb6f419ec8d1aecb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 7 Feb 2013 12:32:10 +0200 Subject: Add Qt5 VC project/solution files --- qt/common/makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'qt/common/makefile') diff --git a/qt/common/makefile b/qt/common/makefile index 2cadcee..6132c7b 100644 --- a/qt/common/makefile +++ b/qt/common/makefile @@ -24,14 +24,20 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) name := qt-common $(dist): name := $(name) $(dist): export dirs := $(tests) -$(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ -$(call vc10slns,$(name)) $(call vc11slns,$(name)) +$(dist): export extra_dist := test.bat \ +$(call vc9slns,$(name)-qt4) $(call vc9slns,$(name)-qt5) \ +$(call vc10slns,$(name)-qt4) $(call vc10slns,$(name)-qt5) \ +$(call vc11slns,$(name)-qt4) $(call vc11slns,$(name)-qt5) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) $(call meta-automake) - $(call meta-vc9slns,$(name)) - $(call meta-vc10slns,$(name)) - $(call meta-vc11slns,$(name)) - $(call meta-vctest,$(name)-mysql-vc10.sln,test.bat) + $(call meta-vc9slns,$(name)-qt4,-qt4) + $(call meta-vc9slns,$(name)-qt5,-qt5) + $(call meta-vc10slns,$(name)-qt4,-qt4) + $(call meta-vc10slns,$(name)-qt5,-qt5) + $(call meta-vc11slns,$(name)-qt4,-qt4) + $(call meta-vc11slns,$(name)-qt5,-qt5) + # Can't have Qt-version specific tests. + $(call meta-vctest,$(name)-qt4-mysql-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests))) -- cgit v1.1