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.7' into qt-master-from-4.7	Olivier Goffart	2011-01-17	3	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
\| *	Update copyright year to 2011.	Jason McDonald	2011-01-10	3	-3/+3
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Merge remote branch 'qt/master' into file-engine-refactor	João Abecasis	2010-11-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
\| * \|	Align .pro with qmake: s/\.sources/.files/.	Miikka Heikkinen	2010-10-08	1	-1/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* \|	Fix deployment for examples and tests	Shane Kearns	2010-10-12	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \|	Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
*	Fix benchmark warnings on symbian.	Michael Brasser	2010-05-24	1	-5/+5
\|
*	Merge commit 'qt/4.7' into 4.7	Miikka Heikkinen	2010-05-17	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/benchmarks/declarative/binding/binding.pro tests/benchmarks/declarative/creation/creation.pro tests/benchmarks/declarative/creation/tst_creation.cpp tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
\| *	Symbian build fix to declarative auto and benchmark tests	Joona Petrell	2010-05-14	1	-7/+7
\| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9491 Reviewed-by: Martin Jones
* \|	Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks	Miikka Heikkinen	2010-05-14	2	-6/+11
\|/ \| \| \| \| \| \| \| \| \|	These tests were either not compiling, were deploying incorrectly, or looking for data files from wrong place. Task-number: QTBUG-10661 Task-number: QTBUG-10666 Task-number: QTBUG-10667 Reviewed-by: Shane Kearns
*	Compile	Aaron Kennedy	2010-03-17	1	-1/+1
\|
*	Fix benchmarks.	Michael Brasser	2010-03-04	5	-13/+16
\| \| \| \|	Get them all running again after renames, etc.
*	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	2	-8/+8
\| \| \| \|	QDeclarativeXXX.
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-23	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
\| *	Fixing deployment on Symbian	Aleksandar Sasha Babic	2010-02-23	1	-0/+6
\| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
* \|	Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.	Warwick Allison	2010-02-23	3	-5/+11
\|/ \| \| \|	Task-number: QT-2798
*	Fix copyright year.	Jason McDonald	2010-02-16	3	-3/+3
\| \| \| \|	Reviewed-by: Trust Me
*	Benchmark cleanup.	Michael Brasser	2010-01-14	4	-8/+8
\|
*	Benchmark cleanup.	Michael Brasser	2009-12-14	1	-0/+2
\|
*	Update benchmarks to run again	Aaron Kennedy	2009-11-23	4	-1/+6
\|
*	fix headers	Warwick Allison	2009-10-30	2	-0/+80
\|
*	fix headers	Warwick Allison	2009-10-29	1	-0/+34
\|
*	Add some basic QML benchmarks	Aaron Kennedy	2009-07-17	7	-0/+193