summaryrefslogtreecommitdiffstats
path: root/src/activeqt/control/qaxserver.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-1/+1
|/ | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers again.Jason McDonald2009-09-091-0/+1
| | | | Reviewed-by: Trust Me
* src/activeqt: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-011-9/+9
| | | | | | | | | support Also, buffer sizes passed to Registry APIs were incorrect. Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* Merge branch '4.5'Marius Storm-Olsen2009-06-301-0/+4
|\
| * Remove a couple of registry entries when unregistering an ActiveX serverAndy Shaw2009-06-291-0/+4
| | | | | | | | | | | | These two entries were not removed since the server was an OOP server Reviewed-by: Prasanth
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-1/+1
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1251
|
* improved string operations all over the placeThierry Bastian2009-05-281-91/+92
| | | | | used character operations whenever possible better usage of QLatin1String
* Long live Qt!Lars Knoll2009-03-231-0/+1251