review.tizen.org Git - profile/ivi/qtbase.git/commit

projects / profile / ivi / qtbase.git / commit

author	Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
	Tue, 10 Apr 2012 10:48:01 +0000 (12:48 +0200)
committer	Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
	Tue, 10 Apr 2012 13:31:45 +0000 (15:31 +0200)
commit	143c4d3e13a430b951f4f4f8c28db14303f80605
tree	2b89637b93fc7d81c674106008566010f986d67c	tree \| snapshot
parent	a7ed81b557d593a8ddb43b71bf4bbf3b44ead070	commit \| diff
parent	e5337ad1b1fb02873ce7b5ca8db45f6fd8063352	commit \| diff

Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

52 files changed:

configure	diff1 \|	diff2 \|	blob \| history
dist/changes-5.0.0	diff1 \|	diff2 \|	blob \| history
qmake/project.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qcompilerdetection.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfile.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qabstracteventdispatcher.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobjectdefs.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/quuid.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbitarray.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguiapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguiapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qplatformsharedgraphicscache_qpa.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwindow.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/painting.pri	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextimagehandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/xcb/qxcbwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/ibase/qsql_ibase.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/psql/qsql_psql.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/kernel/qsqldriver.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/kernel/qsqldriver.h	diff1 \|	diff2 \|	blob \| history
src/tools/rcc/rcc.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/dialogs/qmessagebox.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/itemviews/qlistview.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qapplication_qpa.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qwidgetwindow_qpa.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qcommonstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qmacstyle_mac.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qwindowsxpstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qtextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/codecs/utf8/tst_utf8.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/tools/qstring/tst_qstring.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/dbus/qdbusmarshall/common.h	diff1 \|	diff2 \|	blob \| history
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/other/networkselftest/tst_networkselftest.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/other/qaccessibility/tst_qaccessibility.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp	diff1 \|	diff2 \|	blob \| history
tests/manual/cmake/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
tools/configure/configureapp.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom

configure	diff1 \|	diff2 \|	blob \| history
dist/changes-5.0.0	diff1 \|	diff2 \|	blob \| history
qmake/project.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qcompilerdetection.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfile.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qabstracteventdispatcher.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobjectdefs.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/quuid.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbitarray.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguiapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguiapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qplatformsharedgraphicscache_qpa.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwindow.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/painting.pri	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextimagehandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/xcb/qxcbwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/ibase/qsql_ibase.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/psql/qsql_psql.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/kernel/qsqldriver.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/kernel/qsqldriver.h	diff1 \|	diff2 \|	blob \| history
src/tools/rcc/rcc.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/dialogs/qmessagebox.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/itemviews/qlistview.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qapplication_qpa.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qwidgetwindow_qpa.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qcommonstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qmacstyle_mac.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/styles/qwindowsxpstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qtextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/codecs/utf8/tst_utf8.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/corelib/tools/qstring/tst_qstring.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/dbus/qdbusmarshall/common.h	diff1 \|	diff2 \|	blob \| history
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/other/networkselftest/tst_networkselftest.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/other/qaccessibility/tst_qaccessibility.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp	diff1 \|	diff2 \|	blob \| history
tests/manual/cmake/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
tools/configure/configureapp.cpp	diff1 \|	diff2 \|	blob \| history