summaryrefslogtreecommitdiffstats
path: root/src/activeqt
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-0125-50/+50
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Make reference counting in activeQt container multi-processor safejian liang2012-02-292-18/+21
| | | | | | | | Use InterlockedIncrement() and InterlockedDecrement() to implement reference couting in activeQt container to make it multi-processor safe. Change-Id: Ibe7daab69c27117bb3e35c10ba273bccd29afc69 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make sure we release IAdviseSink interfaceJian Liang2012-02-291-1/+2
| | | | | | | | IAdviseSink interface is not released if spViewObject is 0 in QAxClientSite::activateObject(). This patch fix this problem. Change-Id: I5d215e18468660eab59ef69e6fd71405337264b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make reference counting for QAxClientSite multi-processor safeJian Liang2012-02-291-6/+6
| | | | | | | | | | It is not safe to use ++long/--long to implement reference counting for COM object in multi-processor environment. We use InterlockedIncrement() and InterlockedDecrement() to implement reference counting. Change-Id: Ibfc5f3456cbaefb9267feb378483c5c60c305f00 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Ensure that the type is not registered as a typedefAndy Shaw2012-02-061-1/+1
| | | | | | | | | | | | When qRegisterMetaType() is given a dummy parameter as 0 then it will try to register it as a typedef and not a type. Changing it to be -1 for the dummy parameter will ensure that it is not registered as a typedef. Task-number: QTBUG-18555 Change-Id: I18606bb1e53a334256658cc5b8d8a13c0d6617a1 Reviewed-by: Martin Petersson Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fix a crash when changeEvent() is called and there is no containerAndy Shaw2012-02-021-1/+1
| | | | | | | | | | | When changeEvent() was called and no container had been set up then it would crash because it uses container without checking if it exists. Task-number: QTBUG-23957 Change-Id: I67393bf5c9bc5b437b92ee2c1b72ffbd5cd12af3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit c36006f45fdcbdb97cbc3179c4ecc25203898fc5)
* Update year in Nokia copyright messages.Jason McDonald2012-01-1125-25/+25
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix possible race conditionsKonstantin Ritt2011-10-071-2/+2
| | | | | | | | | the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-021-1/+1
|\ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Fix another case where QVariant::Invalid should be QVariant::UserTypeAndy Shaw2011-04-291-1/+1
| | | | | | | | | | | | | | | | Due to the QMetaType change before 4.7.0, if the typename of the variant is QVariant then the type itself is of UserType and not Invalid as it was previously. Reviewed-by: Martin Petersson
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1725-27/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1025-25/+25
| | | | | | | | Reviewed-by: Trust Me
| * Add support for QMetaType::QVariant in ActiveQtPrasanth Ullattil2011-01-051-2/+1
| | | | | | | | | | | | | | | | | | Previously when we convert the typename "QVariant" to QVaraint::Type, it returns QVariant::Invalid. From Qt 4.7 onwards, it will return QVariant::UserType. Task-number: QTBUG-15157 Reviewed-by: Martin Petersson
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+1
|\ \ | |/
| * Doc: Fixing typoSergio Ahumada2010-10-252-2/+2
| |
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \
| * | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |/
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * QAxBase::dynamicCall() returns invalid QVariantPrasanth Ullattil2010-09-301-2/+4
| | | | | | | | | | | | | | | | | | | | Starting from 4.7.0, QVariant is recognized as a standard type by the meta type system. ActiveQt needs to consider this while converting COM VARIANT types to a QVariant. Task-number: QTBUG-13845 Reviewed-by: Volker Hilsheimer Reviewed-by: Olivier Goffart
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-2/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Read the data when the stream passed in is of type CArchiveStreamAndy Shaw2010-09-101-0/+13
| | | | | | | | | | | | | | | | | | When the stream is of type CArchiveStream then Stat() is not implemented and therefore it will not try to read the data. Therefore if this is not implemented then we try to read the data in chunks instead until there is no more to read or it fails. Reviewed-by: Volker Hilsheimer
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a security hole that has been there for a while, but the public awareness have recently rised so the threat is more imminent now. The solution is to fix all places where we dynamically load system libraries. More specifically, we now load all system libraries with an absolute path that points to a library in the system directory (usually c:\windows\system32). We therefore introduce a small class named QSystemLibrary that only loads libraries located in the system path. This shares some of the API with QLibrary (in order to make the patch as small as possible). We don't fix QLibrary due to risk of regressions. In addition, applications can fix the code that calls QLibrary themselves. The problem does not apply to Windows CE, since the search order is documented as not searching in the current directory. However, it touches some CE-specific code - therefore QSystemLibrary is sometimes used on WinCE (however, it will just do a normal LoadLibrary() since its safe anyway). This change does not affect the testability plugin (it is not clearly documented where that plugin is located, and the plugin should never be used in production code anyway) Loading OpenSSL libraries The ssl libraries are handled specially, and searched in this order (we cannot expect them to always be in the system folder): 1. Application path 2. System libraries path 3. Trying all paths inside the PATH environment variable Task-number: QT-3825 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
* | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-063-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | escape backslashesOswald Buddenhagen2010-05-261-1/+1
| | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | doc: Fixed many broken links.Martin Smith2010-05-191-1/+1
| |
* | make it possible to use sse2 with mingwThierry Bastian2010-03-111-3/+3
| | | | | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-6/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5Prasanth Ullattil2010-02-261-6/+0
| | | | | | | | | | | | | | | | | | The LockWindowUpdate() was used to reduce the flicker caused when calling EnableModeless(). After the above commit, no repaints will be generated by this code path, so we can remove this call. Task-number: QTBUG-8355 Reviewed-by: Bradley T. Hughes
* | Imporve win64 support for mingwThierry Bastian2010-02-223-27/+21
| | | | | | | | Reviewed-by: ogoffart
* | Incorrect property setter generated by dumpcpp for Microsoft Word 2007.Prasanth Ullattil2010-02-101-0/+5
|/ | | | | | | | | | This particular propery setter had multiple parameters (or is Array type property). An incorrect return type was set by the function generator. This patch clears the type name for such INVOKE_PROPERTYPUT functions, the return type will be void. Task-number: QTBUG-7571 Reviewed-by: Volker Hilsheimer
* Update copyright year to 2010Jason McDonald2010-01-0625-25/+25
| | | | Reviewed-by: Trust Me
* doc: Fixed typos.Martin Smith2009-12-181-1/+1
| | | | Task-number: QTBUG-6898
* Update license headers again.Jason McDonald2009-09-0925-0/+25
| | | | Reviewed-by: Trust Me
* Fix compile error for WinCEPrasanth Ullattil2009-09-011-1/+4
| | | | | | Do not use LockWindowUpdate() in Win CE Reviewed-by: Trust Me
* Reduce the flickering caused by QAxClientSite::EnableModelessPrasanth Ullattil2009-09-011-0/+2
| | | | | | | Lock the updates during this call from the activex control. Task-number: 257593 Reviewed-by: Trust Me
* Do not set window tile from IOleInPlaceUIWindow::SetActiveObject()Prasanth Ullattil2009-08-281-3/+4
| | | | | | | | | MSDN docs suggest that all containers ignore the object name parameter passed in this function. The tiltebar should always be set by the container application. Task-number: 204674 Reviewed-by: Trust Me
* fix warnings on mingw (gcc4.4)Thierry Bastian2009-08-043-7/+11
| | | | | | | basically reordering members initialization in constructors or fixing singed/unsigned checks. Reviewed-by: Trustme
* Fix compile error on WinCE.Prasanth Ullattil2009-08-032-1/+16
| | | | Reviewed-by: TrustMe
* QCheckBox on an out-of-process server wont allow <SPACE> key & FocusPrasanth Ullattil2009-07-313-43/+90
| | | | | | | | | | | | | | | | | | | rect is not drawn correctly. Depending on the type of server, QAxClientSite::TranslateAccelerator() needs to process the message differently. For ActiveQt based in-process-servers, only normal Qt event handling is required. For ActiveQt based out-of-process-servers, the message has to be forwarded and Qt event handling needs to continue. For all other type of servers, forward the message and stop Qt event processing. Styles use the WA_KeyboardFocusChange attribute set on the window to decide on drawing the focus rect. ActiveQt handles the VK_TAB key in the QAxServerBase::TranslateAcceleratorW(), the attibute is now set when focus is changed. Task-number: 253763 Reviewed-by: Volker Hilsheimer
* Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-192-8/+8
|
* src/activeqt: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-0112-266/+147
| | | | | | | | | 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-1625-25/+25
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1625-25/+25
| | | | | | | | Reviewed-by: Trust Me
* | improved string operations all over the placeThierry Bastian2009-05-287-157/+158
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-6/+6
| | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
generated by cgit v0.12 at 2024-12-04 00:49:02 (GMT)