{non-gerrit}/qt-labs/widgets-ng.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	renamed examplebase.pri to symbianpkgrules.pri	Espen Riskedal	2009-08-21	24	-40/+48
\| \| \| \| \| \| \| \|	examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
*	Changed names and URLs to reflect name change.	axis	2009-08-19	3	-3/+3
\| \| \| \|	RevBy: Trust me
*	Merge commit 'qt/master'	Jason Barron	2009-08-13	103	-104/+104
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
\| *	Update references to online documentation.	Jason McDonald	2009-08-12	1	-1/+1
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Update contact URL in license headers.	Jason McDonald	2009-08-12	103	-103/+103
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Update license headers according to commit 858c70f768e.	axis	2009-08-06	3	-6/+6
\| \| \| \| \| \| \| \|	RevBy: Trust me
* \|	Merge commit 'origin/master'	Jason Barron	2009-08-06	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
\| * \|	'Trailing whitespace' and 'blank line' fixes for demos and examples	Janne Anttila	2009-08-04	1	-1/+1
\| \| \|
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-8/+25
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Doc: show warnings about unrecognized or unsupported devices in the status	Volker Hilsheimer	2009-07-16	1	-8/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	bar where TabletPC users can also see them. Fixes: task 216859 Rev-by: TrustMe
* \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	103	-220/+220
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
\| *	Demo: fixed colors in the calendar when May 1st is a Friday	Thierry Bastian	2009-06-18	1	-14/+14
\| \| \| \| \| \| \| \|	Task-number: 255114
\| *	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	103	-206/+206
\| \|\
\| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	103	-206/+206
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Make the codeeditor example compile on Windows.	Jason McDonald	2009-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	4	-7/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
\| * \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-27	1	-0/+8
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
\| * \|	Replace all instances of "Ctrl+Q" with QKeySequence::Quit.	Norwegian Rock Cat	2009-05-12	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	We introduce this new enum, we should be using it.
\| * \|	Changed codeeditor include to use double quotes, was failing to compile ↵	Kurt Korbatits	2009-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	uncer windows. Reviewed-by: Justin McPherson
* \| \|	Updated example to make more sense	Markku Luukkainen	2009-06-18	2	-22/+27
\| \| \|
* \| \|	Bugfix. Softkeys were set to wrong widget when combobox was	Markku Luukkainen	2009-06-16	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|	focused.
* \| \|	Updated softkey example to be more complete	Markku Luukkainen	2009-06-15	2	-26/+70
\| \| \|
* \| \|	Better text to label	Markku Luukkainen	2009-06-15	1	-1/+1
\| \| \|
* \| \|	add correct license headers	Espen Riskedal	2009-06-11	2	-3/+74
\| \| \|
* \| \|	Updated example to tell which softkey was pressed	Markku Luukkainen	2009-06-11	2	-8/+19
\| \| \|
* \| \|	Added proper UID	Markku Luukkainen	2009-06-10	1	-1/+11
\| \| \|
* \| \|	Added softkeys example	Markku Luukkainen	2009-06-10	1	-1/+2
\| \| \|
* \| \|	Moved softkeys example to a better place	Markku Luukkainen	2009-06-10	4	-0/+165
\| \| \|
* \| \|	Fixes to make gui compile after clean configure. Removal	Markku Luukkainen	2009-06-06	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|	of QSoftKeyStack broke compilation on clean environment...
* \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Markku Luukkainen	2009-06-03	1	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
\| * \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-02	1	-0/+8
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
\| \| * \|	add deployment rules...	Maurice Kalinowski	2009-05-25	1	-0/+8
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WinCE needs those files to be able to do something useful Task-number: 254430 Task-number: 254437 Task-number: 254428 Reviewed-by: joerg BT: yes
* \| /	Changed stylesheets example to create softkeystack. This commit	Markku Luukkainen	2009-05-19	1	-0/+3
\|/ / \| \| \| \| \| \|	should probably be reverted before merging to master
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-04-27	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
\| *	Install the animation.mng file.	Thiago Macieira	2009-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, for people who install Qt (everyone outside Nokia), the animation file isn't present. Reviewed-by: Trust Me BT: yes
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	192	-0/+15021
\|
*	Long live Qt for S60!	axis	2009-04-24	192	-0/+15101