summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_qws.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+11
| | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-11/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-171-2/+2
| |\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| | |\
| | | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge of masterBradley T. Hughes2009-06-151-2/+2
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-291-3/+3
| |\ \ \
| * | | | Refactor the touch event dispatching code in preparation for allowing ↵Bradley T. Hughes2009-05-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external event generators This introduces QEvent::RawTouch event type, which should be used by the low-level translator. This raw QTouchEvent can be sent to either QApplication or to a window, and Qt will do the rest to dispatch the touch points to the correct place.
* | | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-9/+10
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fixed compile of Qt/Embedded.Rohan McGovern2009-06-131-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes compile error: kernel/qapplication_qws.cpp: In static member function 'static bool QApplicationPrivate::qws_apply_settings()': kernel/qapplication_qws.cpp:2014: error: no match for 'operator!' in '!QApplicationPrivate::styleOverride' kernel/qapplication_qws.cpp:2014: note: candidates are: operator!(bool) <built-in>
| * | | improved string operations all over the placeThierry Bastian2009-05-281-3/+3
| |/ / | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-071-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| * | Make QWS a bit more OS independent.Robert Griebl2009-04-021-4/+5
| | | | | | | | | | | | | | | | | | | | | Some patches needed to support QWS on non-Linux platforms. Reviewed-by: Paul Olav Tvete Reviewed-by: Harald Fernengel
| * | Long live Qt!Lars Knoll2009-03-231-0/+3817
| /
* | Make Qt exception safer.Robert Griebl2009-06-101-5/+22
|/ | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-071-69/+0
| | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+3817