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
*	Corrected paths	Mark Brand	2010-07-08	1	-2/+2
\| \| \| \| \|	Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	Consolidate sql driver configuration redundancy	Mark Brand	2010-07-07	1	-119/+11
\| \| \| \| \| \| \| \| \| \| \|	Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	use "win32-g++*" scope to match all MinGW makespecs	Mark Brand	2010-06-10	1	-11/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Rohan McGovern	2010-03-06	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
\| *	Fixes: ODBC Driver expects 16bit when system is 32bit	Bill King	2010-03-02	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2 bytes wide. Task-number: QTBUG-6928 Reviewed-by: Justin McPherson
\| *	Long live Qt for S60!	axis	2009-04-24	1	-0/+123
\|
*	remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlib	Mark Brand	2010-02-17	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be be removed so that zlib will come from -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. This affects building shared Qt. This patch fixes the problem for win32-g++ and also unix. Assumed that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough. Not sure why parallel logic is in src/sql/drivers/drivers.pri but I fixed that too. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
*	Long live Qt!	Lars Knoll	2009-03-23	1	-0/+123