summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete QT_DLL and QT_NODLL usageMiikka Heikkinen2012-11-261-2/+2
| | | | | | | | | | | | These defines are old compatiblity defines and are no longer supposed to be used. Usage in examples doesn't do anything currently, so removed it entirely. Task-number: QTBUG-28181 Change-Id: I98db88e3ef9f98c70132cea986127ed883dd8503 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Provide missing documentation for QAxSelectMiikka Heikkinen2012-11-192-3/+30
| | | | | | Task-number: QTBUG-27776 Change-Id: Ic67c8fdeb797e5c9867822a21dc788b781dd24a5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove MODULE_*DIR assignmentsOswald Buddenhagen2012-11-011-4/+0
| | | | | | | the respective prfs pull in qt_build_paths now Change-Id: I71a0974df54d94a397545a8c24e8ff154390bb9b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-011-2/+0
| | | | | Change-Id: I16d2fe9fb36489e04c3884846157617e25715f9d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove dependency on a generated ui header file in a public header fileAndy Shaw2012-10-312-20/+30
| | | | | | | | | | | | Since the public headers can be installed then it is not really a good idea to have generated ui header files included in them. Therefore this changes how the ui code is utilized so it creates it as a member rather than subclassing the class instead. Task-number: QTBUG-27776 (partial) Change-Id: I79a2a3f775202133bb6d7f2f30e0b6d86c9fa1fd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix crash when handling WM_PAINT during COM operationsMiikka Heikkinen2012-10-261-0/+12
| | | | | | | | | | | | | | Synchronous expose corrupts painter state if it is done during existing paint operation, which can happen e.g. when requesting some value from dumpcpp generated wrapper inside a slot. Fixed by setting platform native interface property "asyncExpose" when application uses ActiveQt. This allows Windows QPA plugin to do an asynchronous exposes instead of synchronous. Task-number: QTBUG-27209 Change-Id: I93595c1d1dc01601f7a8c4562a145bebb29268b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make ActiveQt libraries build both debug and release versionsMiikka Heikkinen2012-10-132-0/+6
| | | | | | | | | | | | | | | | Since ActiveQt libraries don't load qt_module.prf, build_all doesn't get added to CONFIG automatically. This resulted in only debug version of the libraries getting built when Qt was configured for building both debug and release. Fixed by making sure build_all and debug_and_release are added to CONFIG explicitly in affected libraries if they are present in QT_CONFIG. Task-number: QTBUG-27422 Change-Id: I1338af79457f5337ac95b5c878d384f3e86a589d Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove redundent line as this is done after the loop anywayAndy Shaw2012-10-101-1/+0
| | | | | | | | Since the eventattr is released as soon as the for loop is finished with it makes no sense to do it right before finishing the loop manually. Change-Id: I138bb21913c17f81b90e5b3e01cacc871aed3f09 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2328-222/+222
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4060147644d7ca34ccff71b3deb30e242b611dab Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove mentions of borland from project filesOswald Buddenhagen2012-09-181-1/+0
| | | | | | Change-Id: I4a819e6fa95d3e229d82a286ba212fc7cb572a5c Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix dumpcpp tool to work with revision 7 metaobject format.Miikka Heikkinen2012-09-122-22/+18
| | | | | | | | | | | | | | | | | | | | | | Dumpcpp tool still generated revision 1 moc format, so generated code would no longer compile. Ported relevant revision 7 generation code from moc tool to dumpcpp tool. Also squashed multiple generated string tables into a single string table. QVariant::nameToType(typeName) no longer returns UserType for QVariant, so fixed few comparisons to take this into account. Removed warning print from MetaObjectGenerator::addProperty(), as this just spams warnings unnecessarily when generating properties. Normally the required metatypes are not registered at time of generation (e.g. when running dumpcpp tool). Note that the check for this warning was buggy in Qt4, so it already never printed there. Added a simple autotest to verify dumpcpp generates working code. Task-number: QTBUG-26587 Change-Id: If12d2301890c209e7fbcb3bc054791a1c9d492c3 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix building of qtactiveqtjian liang2012-09-101-2/+2
| | | | | | | | | Use isEmpty() instead of (int)operator to get the first character of QKeySequece object in qaxwidget.cpp since (int) operator has been deprecated from 5.0 Change-Id: Ic2a8857b4d270dae5dcd7dbbe7e8f37b1c045f84 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* explicitly set VERSION for activeqt module version header creationOswald Buddenhagen2012-07-231-0/+1
| | | | | | | the fallback is in qt_module_config, which this module does not use. Change-Id: Ibaf92944e623e65502bda6544e45abc94a308927 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port QtActiveQt to new native event filter system.Stephen Kelly2012-07-233-23/+24
| | | | | | | The old system has been removed. Change-Id: Ief1bd54644f4a09da080bbb966db58a17faec203 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove use of qWinMsgHandler.Stephen Kelly2012-07-231-2/+0
| | | | | | | | This is no longer required, nor does it build, as it had been removed. Change-Id: I38f16b9627ddc4606cc9fac0e5e99686c4a26b2d Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Change CONFIG += staticlib to CONFIG += staticThiago Macieira2012-07-112-2/+2
| | | | | | | That's the targetted, correct way of defining a static library. Change-Id: Ibdf1989b872827ffe1626e1b0b56ae415d883d6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix embedding ActiveQt servers based on native widgets like QGLWidgetMiikka Heikkinen2012-07-061-1/+17
| | | | | | | | | | | | | | | | | | Embedding a QGLWidget based server caused QGLWidget to be shown on a separate toplevel widget. This happened because it is a native widget and therefore creates a platform window before it is shown, so _q_embedded_native_parent_handle parameter we use to indicate embedded windows got set too late and consequently QGLWidget's window didn't know it was supposed to be embedded. Fixed by setting the parent in WM_SHOWWINDOW handler in these cases, and setting the window frameless, which makes platform plugin re-determine correct native flags for the window, now also taking the fact that the widget is embedded into account. Task-number: QTBUG-26438 Change-Id: Id159d864376f773775114c8f00088ce90186b65a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* "export" idc for qtPrepareTool() useOswald Buddenhagen2012-07-061-7/+4
| | | | | Change-Id: I922b0521006dd60d5c34b29fd54556d8bd919a40 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix assert with when ActiveQt server changes status bar text.Miikka Heikkinen2012-07-051-3/+7
| | | | | | | | | | | | | | | | | | | | QAxServerBase has a custom implementation of qt_metacall() to convert any signals generated by the server to COM events. However, QStatusBar::messageChanged() signal has a custom handling where it doesn't generate a COM event for it but instead directly modifies the status bar of the application. This special case was detected by connecting the signal to slot '-1' and then intercepting signals to that slot in qt_metacall(). However, somewhere along the way signal/slot internals have changed so that unsigned shorts are used for slot indexes, which meant qt_metacall() got signal for slot 65535 instead of -1 and therefore didn't properly intercept messageChanged(). Fixed by changing the custom slot index to one that will not get mangled by int to unsigned short conversions. Task-number: QTBUG-26422 Change-Id: I889cb19d1569425ff157a9d897de1cbb4a3f02b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix signals to COM events conversionMiikka Heikkinen2012-07-042-5/+5
| | | | | | | | | | | | | | | | | Events were not generated to IDL files for signals of activeQt servers, because QMetaMethod::typeName() now properly returns "void" instead of empty stringfor methods with void return type. The same issue was present in few other places in code, so fixed those as well. Also fixed incorrect use of return type instead of parameter type where signal paremeters were converted to event parameters in QAxServerBase::qt_metacall(). Previously this bug has gone unnoticed as "type" has typically been empty in this case, which does the default conversion based on QVariant type. Task-number: QTBUG-26411 Change-Id: I3684805bc900d3cad6fbcc8ccabbb3ecac120092 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* ActiveQt: Fix compiler warnings (g++).Friedemann Kleint2012-06-283-7/+12
| | | | | | | | - Unused variables. - Struct initialization. Change-Id: Ia1ad76b27ffcd12c50fdbc9776def53a47ba5951 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix rendering of QAxWidgetsMiikka Heikkinen2012-06-281-2/+4
| | | | | | | | | | | QPainter::redirected() has been obsoleted, so it cannot be used for differentiating between QWidget::render() and regular painting anymore. However, QWidget::redirected() still works, and there is no indication it has been deprecated or obsoleted, so changed QAxWidget to use that. Task-number: QTBUG-26323 Change-Id: I4fd9533dba7f8d4f14c866cca59dbeca47b8cee8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* adjust to build system improvementsOswald Buddenhagen2012-06-203-20/+19
| | | | | | | | | | generation of the version header, the master header and forwarding module pris was moved from syncqt to qt_module_config.prf. as we don't use the latter one due to the untypical module structure, directly include the "snippets" instead. Change-Id: I88cf0222d4cc0cae9c77e7134b94922fc808a892 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix idc build locationOswald Buddenhagen2012-06-192-2/+2
| | | | | | | | | this also implies that the libraries need to be built first, as that's where the module .pri file (which contains the authoritative location) is created. Change-Id: Iba40ac764b4583882175e02a043f11c727f79251 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix: Uninitialised variable causing allocation crash down the line.Bill King2012-06-191-1/+1
| | | | | | | | Task-Number: QTBUG-26192 Change-Id: Ifdd332544a5017e3465e65e9127b852db03001f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix Windows build against qdatetime.h that uses min/maxSimon Hausmann2012-06-132-0/+3
| | | | | | | | Define NOMINMAX to prevent windows system header files from re-defining min/max. Change-Id: I6b392a8eeb89ba54da0bba1baf05165bc5ad2c91 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix embedded ActiveQt server window positioningMiikka Heikkinen2012-06-081-9/+9
| | | | | | | | | Set a property to widget's QWindow to enable Windows platform plugin to properly handle embedded window. Also cleaned up the related code. Task-number: QTBUG-25808 Change-Id: I63502b99f1a8f4d0df9dc3d438833dc3bf9fb2e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix IDL generation for struct type optional parametersMiikka Heikkinen2012-06-071-0/+2
| | | | | | | | | | | | | | | | | A recently added optional QRect parameter for QWidget::grab() caused a build failure in most ActiveQt examples. Optional parameters apparently need to use VARIANT type in .idl file, but the parameter replacement logic didn't account for struct keyword, which is what QRect parameters get in earlier type conversion. Fixed similarly to the enum case. Note that QRect parameters don't seem to work at all even in 4.8, so this is simply a compile fix at this point. Task-number: QTBUG-25955 Change-Id: Ic1a2a2e69d5b9b34e4a2e1199275b961fe82d2c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove a qDebug print that had been accidentally left in codeMiikka Heikkinen2012-06-071-1/+0
| | | | | | | QAxHostWidget::nativeEvent always prints the event type to debug trace. Change-Id: I8e37d944b0e12c9d21961cc8e0bd47f6ea820310 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix OLEColorToQColor()Miikka Heikkinen2012-05-221-11/+1
| | | | | | | | | | | | | | In Qt 4.8 this function used QColorMap::hpal(), which is no longer available. However, it appears from QColormap::initialize() in qcolormap_win.cpp that QColorMap::hpal() pretty much always has returned zero in any recent version of Windows, since they typically utilize more than 256 colors. Therefore we can assume that the value passed to OleTranslateColor is never a palette index but is always RGB value and simply parse the RGB value from the col parameter. Task-number: QTBUG-25806 Change-Id: Iddc9d7c972c74f4e12043dfcc0aaef3d2c15e296 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixes to metaobject handlingMiikka Heikkinen2012-05-212-6/+10
| | | | | | | | | | | | | | | | | | | | 1) Due to changes to metaobjects, QAxBase::qt_static_metacall has replaced a direct qt_metacall use in ActiveQt. The qt_static_metacall function offsets the method id, which seems to be necessary when slots are invoked via Qt, but breaks when invocation comes via COM interface. Fixed by correcting the offset where necessary. 2) In MetaObjectGenerator::metaObject() function (qaxbase.cpp), the assert Q_ASSERT(!typeName.isEmpty()) is wrong, as empty typename is a valid result here. Removed the assert. 3) The type_map in qaxserver.cpp needs "void" -> "void" mapping, as QMetaMethod::typeName() no longer returns empty string for void. Task-number: QTBUG-25804 Change-Id: I53fcae5ac3134b7da85ff2ab2e93f01460da7583 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adapt to _qpa file rename in qtbase.Girish Ramakrishnan2012-05-081-2/+2
| | | | | | | | qtbase change 36547f4eff44361f7a6acd0cff107c0e47561f93 renamed qpa headers. Change-Id: Ia43ce51862f1c358773424bf783d06a0859676de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port ActiveQt to QMetaMethod-based connectNotify()Kent Hansen2012-05-014-4/+4
| | | | | | | The const char *-based API is deprecated and will be removed in Qt5. Change-Id: I587b445fa67cc751d26ed57477f815d7d353a1da Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Addapt activeqt to the QMetaObject changeOlivier Goffart2012-04-253-10/+4
| | | | | Change-Id: I4837ae6556a6da297619be57f40949627ef22c58 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix library link order for ActiveQtJonathan Liu2012-04-232-2/+2
| | | | | | | | | | | This fixes linker error when building projects that use ActiveQt. The dependency libraries for ActiveQt were listed before the QAxContainer and QAxServer static libraries when they were supposed to be listed after when linking. Change-Id: I47da68c7c05b7c707d4fe616146d340156d5ad9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Port ActiveQt to meta-object revision 7Kent Hansen2012-04-186-215/+292
| | | | | Change-Id: Ia87652ade4a2905d6feecd852403af9a9c705976 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-04-185-16/+16
| | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. The (internal) QMetaObject::d::stringdata member is now of type const QByteArrayData *. Use reinterpret_cast to keep it compiling until ActiveQt's meta-object generator has been ported to the new meta-object format (revision 7). Change-Id: Iba6e867f719eae9f72b78d3cd206f27ae13d1328 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix the native event filter of QAxHostWidget.Friedemann Kleint2012-04-121-5/+8
| | | | | Change-Id: I9d3ce4adee894a522a50e6dcf86dcbbe5516def6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix after implementation of modality for QWindow.Friedemann Kleint2012-04-121-2/+17
| | | | | Change-Id: I5a9cbd6fea4982141865089535db8126dca90c7d Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Update access level to staticMetaObject in QAxObject.Jędrzej Nowacki2012-03-221-0/+1
| | | | | | | | QAxObject::staticMetaObject should be public, Q_OBJECT macro would create it like that. Change-Id: If0b1b057bc427339fb91dd409ce10429f0eb3b6d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-124-105/+105
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I3c02c7964bafa091b8bf6b8e0543a51604dcb2bc Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Use winId() to retrieve native window handle when necessary.jian liang2012-03-052-30/+17
| | | | | | | | | Use winId() to retrieve window handle where it wants to enforce window handle and use hwndForWidget() where its native parent window's handle can also be used. Change-Id: I87e7818cc5f2e6e3e8367f981e4857e63411fb9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* minor speed improvement to reference counting in qaxserverbase.cppjian liang2012-03-011-67/+30
| | | | | | | | | Using critical section to implement reference counting in qaxserverbase.cpp is an overkill. This patch use InterlockedIncrement() and InterlockedDecrement() to implement reference counting. Change-Id: I658c87e6a459762e3ea8e5019f4514d5348164fb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make reference counting in activeQt container multi-processor safejian liang2012-03-013-24/+27
| | | | | | | | | 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> (cherry picked from commit ad70be4e5b5c55bd838c389bda7d83c2726a69ea)
* Make sure we release IAdviseSink interfaceJian Liang2012-03-011-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> (cherry picked from commit 99a30ca4ce33c40ba5a469a6f47f5905108381f4)
* ActiveQt: Add support for setting properties by referenceJonathan Liu2012-02-201-9/+45
| | | | | | | | Add support for setting properties by reference to allow properties that can only be set by reference to be changed. Change-Id: I2f39f8720ecd1ba97139ab42756d686db2211cad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Don't register user types as typedefs of void *João Abecasis2012-02-151-8/+5
| | | | | | | | | | | | | | | | | Attempting to register a previously registered type as a typedef is now flagged by QMetaType as a binary compatibility breakage. This was being triggered while building the examples: "QMetaType::registerTypedef: Binary compatibility break -- Type name 'Application*' previously registered as typedef of 'Application*' [258], now registering as typedef of 'void*' [31]." QMetaProperty::userType was introduced in Qt 4.2 and properly does what the code was trying to do. Simplification ensued. Change-Id: Ie0ea9336ba6382d99a0f815f189046c575e5a2c2 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Don't register previously registered types as aliasesJoão Abecasis2012-02-155-34/+23
| | | | | | | | | | | | | | | Some types were being registered in multiple places in different ways. This patch tries to ensure that types are preferentially registered in the canonical qRegisterMetaType<T>(#T) form. Where this is not possible, we first check whether the type is already registered, and only then attempt aliasing to void*/QObject*. Hid away IsPointerToTypeDerivedFromQObject monstruosity, as QtCore now provides a macro for this purpose. Change-Id: I564b6ad3cd14daed9452d85a775c980f5772c703 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a crash when changeEvent() is called and there is no containerAndy Shaw2012-01-311-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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3028-28/+28
| | | | | | | | | | | 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: I82638e41d9adc9180fef26a5548f775399afafb2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
View Lorry Controller Status