summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-112-1/+23
|\ | | | | | | Change-Id: I1d84c406962272548cfdf6eb8930f502a53c41ad
| * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+22
| | | | | | | | | | Change-Id: Ic3edfb9336b0e56f887f7cc7315d35f4e6110362 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Doc: several snippet issues in multiple.qdocNico Vertriest2013-03-153-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | - added path to qdocinc file in qtactiveqt.qdocconf - removed unnecessary snippet label from multiple-demo.qdocinc - modified path to qdocinc file - removed reference to directory name, input statement now only specifying file name multiple-demo.qdocinc Task-number: QTBUG-29101 Change-Id: Icc957907cfcbab97a01ffec07819f667961644b8 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-122-2/+6
|\| | | | | | | Change-Id: Icf07a52714047b64da742762dff1b25346a313a9
| * Compile in the qaxutil files.Andy Shaw2013-02-271-2/+4
| | | | | | | | | | | | | | | | | | Some of the functions were referenced but not implemented as they were implemented in qaxutils.cpp. Therefore they need to be compiled into the library. Change-Id: I0a22776da425ba2c51ee5c84d8d5a1c0728004be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: Ieef1d6274089352f5a4ee7a57f9ddbe39a21fbe8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20124-148/+1805
| |\ | | | | | | | | | Change-Id: Ia85d4c2258973034b04eab63e5b52e5c207b6283
* | | Doc: snippet issues with wrapper-demoNico Vertriest2013-03-052-2/+3
| |/ |/| | | | | | | | | | | | | Adapted qdocconf + qdoc file to new folder structure Task-number: QTBUG-29101 Change-Id: Ifd8e379915bf0bf612e9211b93cc53636d156f94 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: corrected snippet issuesNico Vertriest2013-02-208-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In multiple.qdoc: replace \snippet with \input Replaced statement "snippet" with "input" Replaced "*;" with "*\" Replaced raw-endraw with code-endcode Replaced "raw" with "code" Put code-endcode around numbered paragraphs Resolved conflict in simple-demo.qdocinc Task-number: QTBUG-29101 Change-Id: Idceb971d56551bf9e8bdce410360d418747731fe Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-194-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I7acca59e13988612a7382d84cad280d2cc6a091b Reviewed-by: Jason McDonald <macadder1@gmail.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* | use qt_tool.prf for dumpdocOswald Buddenhagen2013-02-061-6/+1
| | | | | | | | | | | | | | | | it was previously skipped - probably because it contains QT+=widgets. it's still a command line tool, though. Change-Id: I1c641d80d1d2ccdf25ffa4613ad5030c9695a8a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | they are versioned nowadays Change-Id: I67fc2d9c9b9a9096b3351b72ea94e7fc96f98382 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-5/+5
| | | | | | | | | | Change-Id: I190f17d778a9a87a89f4ffe4f2bacec7e6e1014f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'release' into stableSergio Ahumada2013-01-311-1/+1
|\| | | | | | | Change-Id: I4c6c9ec0868de12f01b5a91a8d21ca441bb192a1
| * doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | | | | | | Change-Id: Ia26f4b1ea4b0f9e1fb2e11fbd23850f9fbd3588d Reviewed-by: hjk <qthjk@ovi.com>
| * Merge branch 'stable' into releaseSergio Ahumada2013-01-095-5/+74
| |\ | | | | | | | | | Change-Id: If66343daf53d9a5fc6eebd67b1c5dcfd7d219f55
| * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ia59ccb4a3291c46efb5b15840bea2f988af99d48 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10114-116/+116
| |/ |/| | | | | | | | | Change-Id: Ia19cb01ac9f0c5e3863e684d2f701ac424ba64f4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+61
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I48852313fa05cdf8c0736f9ad821ccc0a0f0e152 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
| | | | | | | | | | Change-Id: I8969a34d153bc63ab8be7eeb70dac3b297bae7e6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: Ib04f0b61c05c5fd7b9a6b60bd40f5e304e8bee4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Initialize the event loop for in-process servers in static builds.Miikka Heikkinen2012-12-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event loop doesn't get initialized properly until first time processEvents() is called. An in-process control that links Qt statically constructs its own QApplication instance, but nothing calls processEvents() on it to kickstart event processing, so the control is unresponsive until something else causes that. Fixed by explicitly calling processEvents() once after QApplication instance is created. Task-number: QTBUG-28716 Change-Id: Id50054082c75d9dce2fb12f0d44fa36601a8fc39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Force importing static plugins for all binaries linking QtAxServerMiikka Heikkinen2012-12-201-1/+1
|/ | | | | | | | | | Normally static plugins are only imported for applications, but any dll implementing an ActiveQt server also needs these imports, so add force_import_plugins to MODULE_CONFIG of QtAxServer. Task-number: QTBUG-28215 Change-Id: I7c221dfd08ca25ba1a9c5246ed4517d00737922f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove some unnecessary CONFIG additionsv5.0.0Oswald Buddenhagen2012-12-176-6/+6
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Id53efb418c1d545c4c90280f54b3824ae8261e49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix namespace generation for ** parameters in dumpcppMiikka Heikkinen2012-12-141-0/+2
| | | | | | | | | Pointer to a pointer (**) type parameters didn't get namespace prepended to them. Task-number: QTBUG-28383 Change-Id: I9379fecfad5814b897af7757d0b7b650b31d01e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Re-enable and test the ActiveQt CMake files.v5.0.0-rc2Stephen Kelly2012-12-1211-10/+185
| | | | | | | | | | | | | | | | The Qt5AxContainer CMake module is the most commonly useful, and the more simple. Using Qt5AxServer requires the user to do some post-build actions currently. In the future, it may be possible to add CMake macros for that kind of thing, but as most people won't use CMake for this at all, it is not so important at this time. http://thread.gmane.org/gmane.comp.programming.tools.cmake.user/44824 Change-Id: If33938f829fbf53190aee9d4652516e1c450f05c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Correct path to examples .pro fileshjk2012-12-121-2/+2
| | | | | Change-Id: I7bdb19ea2379e374e9caa3ab30b988ef16c931ff Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: Added documentation for dumpcpp and dumpdoc toolsVenugopal Shivashankar2012-12-126-1/+266
| | | | | | | Moved from the qtdoc repo Change-Id: I05a84e0e3f4d2b08a1712da3cf8d9515e9987b74 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Edited Active Qt documentationJerome Pasion2012-12-1122-368/+497
| | | | | | | | | | | -fixed snippets, examples -left demos alone. Don't know if they were working. -updated landing page -added QAxContainer and QAxServer module pages Task-number: QTBUG-28042 Change-Id: Ic446680319fa9cc0e917cebdb30d6a246026ac20 Reviewed-by: hjk <qthjk@ovi.com>
* Add \brief comments to ActiveQt examples.hjk2012-12-109-9/+9
| | | | | Change-Id: I33e64247a11e9f708890b4b75859295f8cad7c94 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* be able to build ActiveQt's docs on non-Windows platformsJoerg Bornemann2012-12-083-9/+15
| | | | | | | | We're generating a fake project that only provides the docs target. Change-Id: I69854b97193e0c001f840a5a154ff2170dec41f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* modularize docsJoerg Bornemann2012-12-0836-751/+41
| | | | | | Change-Id: I6bca7b3087d71d741926ed30200bc64aaf4391a4 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* dumpcpp: compile with QT_NO_CAST_TO_ASCIIJoerg Bornemann2012-12-062-4/+5
| | | | | | | Change-Id: I96750ea25c6b4499dccf55509510c076bc4ad371 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> (cherry picked from commit 59a003faafe53a155e4a46725ef41b1b7dca4b75)
* sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1Sergio Ahumada2012-12-041-1/+1
| | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I4a192ef6266d3e1a0c2c81679b7fa7a3658ac34c Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* dumpcpp: use temporary file as class implementation bufferJoerg Bornemann2012-12-041-3/+28
| | | | | | | | | | | Instead of writing vast amounts of data into a QByteArray, we're using a temporary file as clipboard. This enables us to handle much larger import tables without worrying about running out of RAM. Task-number: QTBUG-28325 Change-Id: Ied9567651cd859400ba3ed9a45cbbaac603300b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* dumpcpp: properly clean up temporary metaobjectsJoerg Bornemann2012-12-042-6/+18
| | | | | | | | | | | | | | | | | | | | All qax_* functions that return QMetaObject instances actually return instances of QAxMetaObject. To make sure that ~QAxMetaObject is called, we introduce the qax_deleteMetaObject function and call it in the appropriate places. The explicit call to QByteArray::detach is needed because the affected QMetaObject/Method calls return a QByteArray that directly holds a pointer to the QByteArrayData contained in QAxMetaObject. Once the QAxMetaObject is destroyed, the QByteArray objects will hold pointers to freed memory. Therefore we make a deep copy of the QByteArray by detaching it. Task-number: QTBUG-28325 Change-Id: I97613f12f1a30608dd5acd67d0faebb3f39cdf70 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* All QWindow properties that have "window" in them have been renamed.Sergio Ahumada2012-12-041-2/+2
| | | | | | | Depends on patch cd34da54269e6cd7fa5c18242d982736f022a14a in qtbase. Change-Id: I166451a322e89f2e135ede581ee628550d7f05cc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-0311-33/+10
| | | | | | | follow respective change in qtbase Change-Id: I6bbcefcad264191dac51d52cd335de776ae3bfe5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* unmess library namingOswald Buddenhagen2012-12-033-3/+4
| | | | | | | | | | the libraries all get a canonical "Qt" prefix. note that the common include dir stays ActiveQt. Task-number: QTBUG-27776 Change-Id: I80bc1ce8a88341a28d818a46f08d0f38f3c3fc4a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Autotests utilize dumpcpp tools, so make tests depend on toolsMiikka Heikkinen2012-12-031-0/+1
| | | | | | Change-Id: I06e33eb36955ee2ccd9bdb0b7d3d2d51bd861945 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix crash when calling initialize from non-gui application.Miikka Heikkinen2012-11-291-1/+1
| | | | | Change-Id: Ib1602e7cba01e9fc05e4c1ea28bc755afa51e0fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* fix unused variable warning in release buildJoerg Bornemann2012-11-291-0/+1
| | | | | | Change-Id: I3b665102b12dffd9a14ec6523d17ba9a76f49146 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* fix lib order for MinGWJoerg Bornemann2012-11-293-8/+4
| | | | | | | | Put the OLE references into the last lib of the chain. Change-Id: I69d87098f96ed8a99e1e0fe713ad014bbd631462 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Set window flags correctly.Friedemann Kleint2012-11-291-1/+1
| | | | | | Change-Id: Ia1952c0493319471cc427df884680087114fe65c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix compiler warnings in ActiveQt (MSVC/MinGW).Friedemann Kleint2012-11-298-38/+38
| | | | | | | | | | - Unused variables/parameters - Assigned/unused values - default missing in switch - QString/ASCII conversions Change-Id: I2c71473525d4075d13e7fea3bda3292de62f17aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Don't create broken cmake config files.Stephen Kelly2012-11-283-0/+9
| | | | | | | | | | | | | | | | | The inconsistencies in activeqt (in library/module naming header dir naming etc) mean that create_cmake.prf creates unusable cmake config files. Rather than do that, don't create the files at all for now. The user has a workaround of writing a Find module anyway. If the libraries are made consistent before Qt 5.0 we can generate the files, otherwise we can do some more complicated and 'correct' workarounds to generate correct cmake files in Qt 5.1. Task-number: QTBUG-27776 Change-Id: Ib185722025dd9fa8eaae84673c8f6221cf7b4b35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-283-6/+6
| | | | | | | Task-number: QTBUG-28156 Change-Id: I3b33ee0a574b7ec5c4f192a40877bf0141ff2df1 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix activeqt module structureJoerg Bornemann2012-11-2827-319/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The formerly monolithic ActiveQt module has been split into three modules: axserver A static library for creating a server project. axcontainer A static libary for creating a container project. axbase A static library with shared code for the latter two libraries. This module also is responsible for the installation of header files in the include/ActiveQt directory. "CONFIG += qaxserver" has been deprecated. Use "QT += axserver" instead. "CONFIG += qaxcontainer" has been deprecated. Use "QT += axcontainer" instead. Code from qaxtypes.cpp that does not depend on the QAX_SERVER define has been moved to qaxtypefunctions.cpp and resides in the axbase module. Task-number: QTBUG-27776 Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* fix midl call in testcon.proJoerg Bornemann2012-11-281-1/+1
| | | | | | Change-Id: Ia7c90a07949417add54701154251cdf495c6bcb6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* remove deprecated QT_MODULE from headersJoerg Bornemann2012-11-289-18/+0
| | | | | | Change-Id: I7969b73a10b6270fb06579f26c5cef497d1201a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:45:34 +0000