qt5 fix

drizt · drizt · commit e4583a3caea8 · 2014-10-29T00:06:21.000+05:00
Use .qmake.conf on Qt5 instead of .qmake.cache.in. http://qt-project.org/wiki/QMake-top-level-srcdir-and-builddir
diff --git a/.qmake.conf b/.qmake.conf
@@ -0,0 +1,3 @@
+top_srcdir=$$PWD
+top_builddir=$$shadowed($$PWD)
+top_iris_builddir=$$shadowed($$PWD)/iris
diff --git a/psi.pro b/psi.pro
@@ -6,14 +6,19 @@ include(conf.pri)
 unix:system("echo \"include($$top_srcdir/src/conf_iris.pri)\" > $$top_builddir/iris/conf.pri")
 windows:system("echo include($$top_srcdir/src/conf_iris.pri) > $$top_builddir\\iris\\conf.pri")
 
-sub_initvars.file = initvars.pro
 sub_iris.subdir = iris
-sub_iris.depends = sub_initvars
 sub_src.subdir = src
-sub_src.depends = sub_initvars sub_iris
+
+!greaterThan(QT_MAJOR_VERSION, 4) {
+	sub_initvars.file = initvars.pro
+	sub_iris.depends = sub_initvars
+	sub_src.depends = sub_initvars
+	SUBDIRS += sub_initvars
+}
+
+sub_src.depends += sub_iris
 
 SUBDIRS += \
-	sub_initvars \
 	sub_iris \
 	sub_src
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+top_srcdir=$$PWD`
	`2`	`+top_builddir=$$shadowed($$PWD)`
	`3`	`+top_iris_builddir=$$shadowed($$PWD)/iris`