summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Update dependenciesFriedemann Kleint2020-05-053-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia1bf81c340a6168a9f93d5427e0f96a15c60718d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Remove wince from .pro filesFriedemann Kleint2020-04-282-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78167 Change-Id: I23270018ce8c6c66eeb8aa631147ae7b468088fe Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: I0210db12d18aa468e8c445b812cdda7ded881851
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Ib0a488304d6cf03e89153f4fd42051b7bd5ad3fb
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I6b3ef1c4834a9e962baa0906ea8334965bb1df4c
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 2bb2080ddc9c45b425f1e38f21c737932a3768ce Add per-user registration support to IDC tool + 974bead30f32a832180126944973c82f5bc6f6e2 Workaround for Application.WordBasic.DisableAutoMacros not working + 6ae4d9b39285d84dad731893444f7027945900fb Bump version Change-Id: Ibc9a55d5dd50e464da533e6fb9faa88e5bef3d2b Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | testcon: Fix build after removal of QLayout::setMargin()Friedemann Kleint2020-04-181-1/+1
| | | | | | | | | | | | | | | Change-Id: If36f3576952dad987847903b81d0c64da4fdc40e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | QAxBase: Streamline codeFriedemann Kleint2020-04-153-129/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove duplicated assignment of variable index - Extract QAxBasePrivate to a private header - Make checkHRESULT a member of QAxBasePrivate, removing the "that" parameter. - Streamline the code for handling exceptions; the signal will always be present in QAxObject, QAxWidget. Change-Id: I16b278ff87fb09e18f4fc809e564b609f1081624 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Move static methods/properties of QAxWidget/Object to the frontFriedemann Kleint2020-04-151-30/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static methods and properties (control, exception()), are currently at the back behind the COM properties and functions starting with captical letters due to the usage of a QMap to sort them alphabetically. Extract helpers to add them to the QMetaObjectBuilder directly without storing them in the maps and add them first. Change-Id: I774dc44a2c1579e839c26433d37d78eac1e0beb6 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-1110-193/+468
|\| | | | | | | | | | | Change-Id: I4e9dbc17f87a6b604b77ca9e0f9ac1810df870a1
| * | Add a manual test for dumpcppv5.15.0-beta4Friedemann Kleint2020-04-0810-193/+468
| | | | | | | | | | | | | | | | | | | | | | | | Let it generate code for the WebBrowser and display the meta object. Factor out useful code from axviewer. Change-Id: Ib250c749459836e2145f83f4f68fa0caee2a2ad9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | dumpcpp: Use moc to generate metaobject codeFriedemann Kleint2020-04-086-490/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dumpcpp contained an old version of moc code, which is now out of date. Write out the interface as C++ code and run the real moc on it to generate this. Some modifications are required. Remove some asserts that checked on an empty meta object created in the fallback path of QAxBasePrivate::metaObject() which was removed by 0bcdc74f55574e1a45bef8728bd5093cf1acfc33. Task-number: QTBUG-82945 Change-Id: Ide58bae1440331ea4d5da0fcc74b41f49f09599a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Update include for QAction after move from widgets to gui in qtbaseVolker Hilsheimer2020-04-014-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix include for QAction after move from widgets to gui in qtbase - Adapt to OpenGL split - Skip dumpcpp test for the moment Change-Id: I8fcec00c56158ee427a9f374b07bb814a99d3bce Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | testcon: Remove QActionGroup from main formFriedemann Kleint2020-03-301-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | QActionGroup support of Qt Designer was dropped in Qt 4. The group in question is also not exclusive, so, it does not make sense. Change-Id: I8927c730bab9071fd05de4207f4727c5d1bf4922 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-03-307-54/+52
|\| | | | | | | | | | | Change-Id: If239a0087c615b25a088eb60561ff7e019ea316c
| * | OpenGL example: Polish a bitv5.15.0-beta3Friedemann Kleint2020-03-301-3/+6
| | | | | | | | | | | | | | | | | | | | | Remove ugly C-style cast and add Q_UNUSED(). Change-Id: Ia6ec8202ef2a5ad44a05c4f4bb68ed5936381f53 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | OpenGL example: Use double in GL functionsFriedemann Kleint2020-03-302-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | This eliminates warnings about float truncation and increases readibility of the code. Change-Id: I9fcae5a556128a31a508613289772128a908a3bb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | OpenGL example: Port to QOpenGLWidgetFriedemann Kleint2020-03-305-14/+17
| | | | | | | | | | | | | | | Change-Id: I81b1b2b251a3ffca2f925d5d61f88ac71728ca2b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | testcon: Adapt to renamed signal of QComboBoxFriedemann Kleint2020-03-302-3/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-80906 Change-Id: Id18ae4adea182291ccd8b367e055afb894c97bb5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Port to QMetaObjectBuilderFriedemann Kleint2020-03-302-195/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveQt needs to be ported to use QMetaObjectBuilder to assemble the metaobjects to remove the dependency on the internal representation. This requires removing the QAxMetaObject inheriting QMetaObject since the builder produces plain QMetaObjects. Cache the extra information in a struct by meta object instance. Rewrite the generator code to use QMetaObjectBuilder. Simplify the code around Method::flags; story only real attributes; access and meta method type are redundant. Task-number: QTBUG-82945 Change-Id: I911959390976ee9f8c77bfc49bd5d4c4ae7d4bcb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-281-1/+220
|\| | | | | | | | | | | Change-Id: I0d744d349dbeb682413058db58ed8a3a347e0a38
| * | axviewer test: Add a metaobject dumpFriedemann Kleint2020-03-271-1/+220
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82945 Change-Id: If9c84743779acdd199fd67ec2c2f4fc72f58129a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-181-1/+2
|\| | | | | | | | | | | Change-Id: I2910828c915f0a48069f161c1e7feeeac0f1faff
| * | Fix broken IDL version handling in DumpIDLFredrik Orderud2020-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDL versions are limited to "major.minor" format, where each number can range from 0 to 65k. Patch and build numbers are not supported. The current implementation just removes extra dots, converting a "10.20.30.40" version string into "10.203040", which seem odd to me. It also causes the following failure when the concatenated "<minor><patch><build>" string exceed 65k: MIDL2152: [version] format is incorrect Change-Id: I915e70a5480f69caa3822ec9b41fc6edc7fe4cfa Fixes: QTBUG-82883 Reference: https://docs.microsoft.com/en-us/windows/win32/midl/compiler-errors Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-081-0/+6
|\| | | | | | | | | | | Change-Id: I6a3266cb21f30206ecb991fb1dc99e25f9a91259
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-051-0/+6
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib32f4a8475ca9c0cd487ce2dadf0e3a4c94a05da
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | Change-Id: I4c8522c91301ebd3df13358055e9289b9bddcc32
| | * Workaround for Application.WordBasic.DisableAutoMacros not workingFriedemann Kleint2020-01-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke() only works for this method when pVarResult is 0. Fix as contributed on report. Fixes: QTBUG-81543 Change-Id: I8163bccc9c69ef9c5bffb5270d2779e94e587c7e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Id600dfa4d51e7faf8f4c4c6978f974d3bcd2b521 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\| | | | | | | | | | | Change-Id: Ic2c8b5478986f17fc286266836e4f2ac35287db9
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\| | | | | | | | | | Change-Id: I5b6bca7361a5ca5d72fac483f32d3e2ef342b803
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I9e7e66de2e8bcb13bb2425a7d692b966a7028005
| | | * Merge 5.14 into 5.14.1v5.14.1Kari Oikarinen2020-01-151-1/+1
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ifdc883e859924f743dafd0a9093e9d571917b5fb
| | | * | Add changes file for Qt 5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 95304102ce905cf3661f5669428bc4e5b9a418a4 Bump version Change-Id: I90d2da1b0743574a760c074daa0af934565745e3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b6504d75da6ec979ff97f0278ffd85bc770bf17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie44dd7f87bae113726488d59e750fa7d0c8553f6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92f3bf4a13bc1101c64f4d1566161c3136b9af4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f34f693d8430987186655d31b8a28269f2bfa56 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief8ef95bff3295f789e11bf4490b0cc10d04d6c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-212-30/+78
|\| | | | | | | | | | | | | | | | | | | Change-Id: I6fb1b70a5e2a1c376cf332f28fab67a4da36db31
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-182-30/+78
| |\| | | | | | | | | | | | | | | | | | Change-Id: I58798072e9c8201ad807757949f6e600fed6dcd0
| | * | | Add per-user registration support to IDC toolFredrik Orderud2020-01-161-29/+77
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done to re-enable COM registration from IDC without requiring administrative privileges by passing "/regserverperuser" from the command-line. This functionality was accidentally broken in f2b9781e4dab88b191d73378deedfa7fb0d5ae02. Task-number: QTBUG-76269 Change-Id: I671d1993c022a1fef550528fc1e42e5bd05ebded Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | QAxServerBase: Initialize member "exception"Friedemann Kleint2020-01-141-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Fix an oversight of 20f6c67635240865d33a370230a156de0f051d07. Fixes: QTBUG-81367 Change-Id: Ia16e11713a3909b35532e0653fedbdec59109b5a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-191-1/+1
| | | | | | | | | | | | | | | Change-Id: I830d91302e5467f7e0f73257951fd20a273aa578 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I0467032cfc0eaa4785dbbd23a6fc8eb94ca507c1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I4bc3c8cd9559e0199dfdf9cf709a900bd725a176 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix build of QtActiveQt after moc string data changesSimon Hausmann2020-01-135-35/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e58b44d557b859b7b55869f1e137aa1bc8968307 in qtbase changes the meta-object to store string data as an array of offsets and length into the char array instead of a synthetic QByteArrayData (in the old format). This is a port to the new data structure. Change-Id: Ieacfdab69d799f954d9351f8424284b1e6633698 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2020-01-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic886c49cdecc70349c38fb919cf1270f671417a3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | Change-Id: I7934931f050e91c81f6ac740f43ccd1af214db24
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibfabe0671596bf6ba3ef5fe8bcfbcc1e02cbf1ab
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:56:30 +0000