summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/widgets.pri
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-041-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Move QLineEdit logic into QLineControlAlan Alpert2009-07-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Manually merged from the kinetic repository, where it has been used for a while. Like QTextControl, there is no auto test for the control, just for the widgets built with it. The purpose of this change is so that we can build stuff like QLineEdit in other places (like kinetic). Also included is a trivial change to QValidator, needed to use it with QLineControl in QML. Reviewed-by: mbm
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * QMenuBar: simplification of codeThierry Bastian2009-06-291-0/+2
| | | | | | | | More to come: calculation of geometry
| * Long live Qt!Lars Knoll2009-03-231-0/+162
|
* Fixes from code reviewMarkku Luukkainen2009-06-091-2/+2
|
* Fixed parsing error when doing configure+compile in cleanMarkku Luukkainen2009-06-081-5/+4
| | | | environment
* Fixes to make gui compile after clean configure. RemovalMarkku Luukkainen2009-06-061-6/+6
| | | | of QSoftKeyStack broke compilation on clean environment...
* Removed QSoftKeyStack and replaced places using it with theMarkku Luukkainen2009-06-061-6/+2
| | | | new improved softkey interface in QWidget
* Softkeys also for non-S60. Currently only as stub. Will eventually goAlessandro Portale2009-05-191-11/+7
| | | | into a separate implementation file.
* Adding qsoftkey* to widgets.pri. Currently, only for S60. It will spreadAlessandro Portale2009-05-121-1/+10
| | | | as soon as it builds cross platform.
* Long live Qt for S60!axis2009-04-241-0/+166