Andy Shaw dbc7ed8214 Ensure that there is no duplication of the output directory in output ... When a relative path was specified as the output then it would be in both Option::output_dir and Option::output. Therefore in that case Option::output should be just the filename as Option::output_dir has the correct path to output to. Task-number: QTBUG-39460 Change-Id: Idc988e6bad94f34b89660fb5e8d6fa3a39dc623b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>		2014-06-06 08:49:06 +02:00
..
doc	Merge remote-tracking branch 'origin/release' into stable	2014-05-01 13:08:42 +02:00
generators	install pdb files also for static libraries	2014-06-05 17:11:46 +02:00
library	qmake: Use QDir::toNativeSeparators on paths printed as info	2014-05-08 16:37:59 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Ensure that there is no duplication of the output directory in output	2014-06-06 08:49:06 +02:00
Makefile.unix	Merge remote-tracking branch 'origin/stable' into dev	2013-12-24 00:56:59 +01:00
Makefile.win32	Fix configure & qmake compilation with a future MSVC version	2014-02-01 06:56:45 +01:00
meta.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
meta.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
option.cpp	don't make relative paths if we don't know the top-level build dir	2014-04-16 07:28:52 +02:00
option.h	qmake: Expose qmake arguments as QMAKE_ARGS	2013-10-24 20:20:59 +02:00
project.cpp	implement simple VFS to support caching during project parsing	2013-08-07 13:58:41 +02:00
project.h	qmake: cleanup DISTFILES	2014-01-17 14:32:19 +01:00
property.cpp	fix signedness warnings	2013-11-04 19:49:55 +01:00
property.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	move qlocale_mac.mm to OBJECTIVE_SOURCES	2014-05-08 21:28:45 +02:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00