lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-27 07:06:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into stable

Browse Source 
Conflicts:
	qtbase
	qtdeclarative
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtsensors
	qttools

Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
This commit is contained in:
Sergio Ahumada
2013-06-24 08:39:37 +02:00
parent a3dd3624f9 16e4fb6c98
commit 76e3f3d2a6
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@@ -41,6 +41,7 @@
############################################################################# #############################################################################
srcpath=`dirname $0` srcpath=`dirname $0`
srcpath=`(cd "$srcpath"; /bin/pwd)`
configure=$srcpath/qtbase/configure configure=$srcpath/qtbase/configure
if [ ! -e "$configure" ]; then if [ ! -e "$configure" ]; then
echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 echo "$configure not found. Did you forget to run \"init-repository\"?" >&2