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
*	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-05-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: translations/translations.pri
\| *	rename qt_iw.ts to qt_he.ts	Oswald Buddenhagen	2010-05-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	iw comes from the obsolete ISO639. we are using ISO639-1 or something newer.
* \|	fix ts-assistant target	Oswald Buddenhagen	2010-02-25	1	-1/+1
\| \|
* \|	Prepare translations of the declarative module.	Friedemann Kleint	2010-02-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* \|	Merge remote branch 'origin/4.6' into qt-master-from-4.6	Olivier Goffart	2010-02-04	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
\| *	Added Czech translations.	Pavel Fric	2010-02-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* \|	Add Qt base hungarian translation	Laszlo Papp	2010-02-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* \|	Merge branch '4.6'	Thiago Macieira	2010-01-21	1	-2/+6
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
\| *	another attempt at fixing the translations build	Oswald Buddenhagen	2010-01-19	1	-2/+6
\| \| \| \| \| \| \| \|	make qmake generate proper dependencies on lrelease in vcproj/sln files
* \|	Merge branch '4.6'	Thiago Macieira	2009-12-02	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
\| *	another shot at fixing directory separators in build commands	Oswald Buddenhagen	2009-11-25	1	-1/+1
\| \|
* \|	Merge branch '4.6'	Thiago Macieira	2009-11-25	1	-29/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
\| *	fix mingw build when sh is in $PATH	Oswald Buddenhagen	2009-11-16	1	-1/+1
\| \|
\| *	make qm file creation a regular build step	Oswald Buddenhagen	2009-11-10	1	-32/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this is mostly a revert of the revert of the previous attempt, only that this time we have a bootstrapped lrelease which won't blow up for cross-compilations. Reviewed-By: Jason McDonald Task-Id: QTBUG-4939
* \|	Merge branch '4.6'	Thiago Macieira	2009-10-08	1	-4/+1
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tools/assistant/translations/translations_adp.pro
\| *	Merge branch '4.5' into 4.6	Thiago Macieira	2009-10-08	1	-4/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/itemviews/qheaderview.cpp
\| \| *	fix ts and qm targets under windows	Oswald Buddenhagen	2009-10-07	1	-4/+1
\| \| \|
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-10-05	1	-3/+3
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
\| * \|	fix ts and qm targets for shadow builds and builds with -prefix	Oswald Buddenhagen	2009-10-01	1	-2/+2
\| \| \|
\| * \|	remove *_untranslated.ts	Oswald Buddenhagen	2009-10-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway.
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-09-30	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qdatastream.h
\| * \|	Add Slovenian translation	Jure Repinc	2009-09-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-09-29	1	-0/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/qt4-intro.qdoc
\| * \|	I18N: Add new module, fix spelling glitch.	Friedemann Kleint	2009-09-29	1	-0/+2
\| \| \|
* \| \|	Stop building the depricated Assistant translation, soon the be removed.	kh1	2009-08-31	1	-7/+2
\|/ /
* \|	Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-06-18	1	-3/+35
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
\| *	revert built-time qm generation	Oswald Buddenhagen	2009-06-16	1	-3/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
* \|	Merge commit 'origin/4.5'	Bjørn Erik Nilsen	2009-06-12	1	-35/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
\| *	turn qm generation into a build time target	Oswald Buddenhagen	2009-06-11	1	-35/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	consequently, remove the qm files from the repository this uses some really black magic to convince qmake to do the right thing. this will be fixed properly in a later version. Reviewed-by: mariusSO
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-27	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
\| *	Updated danish translations. Added them to relevant project files.	Thomas Sondergaard	2009-05-26	1	-1/+1
\| \|
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	1	-0/+107
\|
*	Long live Qt!	Lars Knoll	2009-03-23	1	-0/+108