Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.	Dominik Riebeling	2010-04-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|	When using the configuration option "-config silent" building on MinGW fails due to the use of the backslash as path delimiter. Using DIR_SEPARATOR instead of the hardcoded delimiter (like done for MOC) fixes this. Reviewed-by: aavit Merge-request: 1697 Reviewed-by: aavit <qt-info@nokia.com>
*	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
\| *	general wording change for some file type names	Frederik Schwarzer	2009-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* \|	Fixed compile of Qt/symbian projects which set a custom MOC_DIR	Rohan McGovern	2009-07-23	1	-3/+3
\|/ \| \| \| \| \| \| \| \|	or UI_HEADERS_DIR. This win32-specific path logic needs to get executed when the _host_ platform is win32, not the _target_. Acked-by: mstormo
*	do not add UI_DIR to INCLUDEPATH if no FORMS are used	Oswald Buddenhagen	2009-04-20	1	-4/+6
\| \| \| \|	Reviewed-by: mariusSO
*	make shadow builds with default moc/ui dirs work again	Oswald Buddenhagen	2009-04-07	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	append the source dir to the include path, but only after the dirs with the generated files. this seems to have worked before only accidentally: the unqualified default dirs were expanded to the source dir instead of the build dir, but the build dir is added implicitly by default, so things magically worked. now that we qualify the moc/ui dirs, projects relying on the strange side effect suddenly break. we should probably add the source dir to the include path by default, but this coupling to uic/moc is closer to the historical behavior and thus should be safer. Reviewed-by: mariusSO
*	some more quoting for qmake ...	Oswald Buddenhagen	2009-04-02	1	-1/+1
\| \| \| \|	sometimes, even two reviews are not enough ...
*	re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992f	Oswald Buddenhagen	2009-04-02	1	-1/+4
\| \| \| \| \| \| \|	this time, it can deal with directories which are absolute to start with. Reviewed-by: mariusSO
*	Revert "make shadow builds work even if a non-shadow build is present"	Bradley T. Hughes	2009-03-27	1	-1/+1
\| \| \| \|	This reverts commit 3aff9113a9702ea6f7e099a73136a718ae1b992f.
*	make shadow builds work even if a non-shadow build is present	Oswald Buddenhagen	2009-03-27	1	-1/+1
\|
*	Long live Qt 4.5!	Lars Knoll	2009-03-23	1	-0/+111