summaryrefslogtreecommitdiffstats
path: root/tools/shared
Commit message (Collapse)AuthorAgeFilesLines
* Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0617-55/+55
| | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0317-55/+55
| | | | | 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-3055-110/+110
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 license header changes from 4.5Volker Hilsheimer2009-06-1655-110/+110
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1655-110/+110
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2568-15/+1157
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | improved string operations all over the placeThierry Bastian2009-05-281-3/+3
| | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | Fixed Qt 4.6 source package compilation by moving the qvfb skins.Friedemann Kleint2009-05-1364-0/+1154
| | | | | | | | | | | | | | | | | | | | | Move skins to tools/shared/deviceskin and have them included automatically by the profile. Acked-by: Jason McDonald <jason.mcdonald@nokia.com> Acked-by: Warwick Allison <warwick.allison@nokia.com>
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-1716-96/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * | Long live Qt!Lars Knoll2009-03-23115-0/+32727
| /
* | Make Qt exception safer.Robert Griebl2009-06-1032-249/+136
|/ | | | | | | | 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
* Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1616-96/+0
| | | | | Reviewed-by: Trust Me ....though discussed with three devs.
* Long live Qt 4.5!Lars Knoll2009-03-23115-0/+32739