qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'stable' into dev	Frederik Gladhorn	2013-01-04	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
\| *	clean up example project files, mostly wrt QT+=widgets	Oswald Buddenhagen	2012-12-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move QT+=widgets (and printsupport) statements before the install statements, and de-duplicate some cases. also move some TARGET assignments to a more conventional place. Change-Id: I6140d8611680f66c24490e5894e4eb90cae95635 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* \|	add auto-detect system language in i18n example	Jing Bai	2012-12-12	3	-4/+15
\|/ \| \| \| \| \| \| \| \|	It makes this example more complete since we move linguist related examples into qttools Task-number: QTBUG-28434 Change-Id: Ic6bbbd2702b5a0a304b5e8ce59da37ef95e4b42e Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
*	centralize and fixup example sources install targets	Oswald Buddenhagen	2012-11-29	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|	it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk <qthjk@ovi.com>
*	delete .desktop files of examples	Oswald Buddenhagen	2012-11-28	1	-11/+0
\| \| \| \| \| \| \| \| \|	they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I27e2c35375e28645b0c03449ddc7ac7017da5943 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
*	Examples: move widgets specific "tools" examples to the correct place	J-P Nurmi	2012-11-28	36	-0/+1335
	examples/tools -> examples/widgets/tools Change-Id: I8b9e23c45e07ce5cd9da8f24a9a9f7ae10b2b107 Reviewed-by: hjk <qthjk@ovi.com>