aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldevtools/qmldevtools.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-03-171-8/+5
|\ | | | | | | Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
| * Fix usage of QtQmlDevTools private headers on OSX with framework buildsSimon Hausmann2015-03-161-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this module borrowed its private headers from QtQml, so that when writing QT += qmldevtools-private, you'd get the private headers from QtQml. This doesn't work when QtQml is built as a framework. A cleaner solution is to give this module its headers proper by letting syncqt create the forwarding headers correctly (and consequently also include them in make install). In order for this to work, the included headers themselves cannot include any headers from QtQml, which this patch also takes care of, through a centralized inclusion of qv4global_p.h. Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Remove QQmlDirParser from QtQmlDevToolsSimon Hausmann2015-03-161-1/+0
|/ | | | | | | | This class is not needed in the library. Change-Id: Ie880086a849b62a2856d1f388a64d363b040cb56 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Re-fix the warning from cached-powers.ccThiago Macieira2014-05-091-0/+6
| | | | | | | | | | This file is now getting included in a different module. See also e02cb2b31ab0b171f11d278305d9f532f005bc80, 60aed669345be33b916c44556555b922aa3ed928, and 66e72c2cf08c2d2c381c6c22e4760d0df758af52. Change-Id: Ic886bdf823d5dd6d9ae3df64608d8bb9d901661f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Extend the QML bootstrap library by the IR buildersSimon Hausmann2014-04-231-1/+5
| | | | | | | | | | | | | This is among other things needed to fix the qml import scanner to detect dependencies from .js files correctly. The patch also fixes the use of Q_QML_EXPORT towards Q_QML_PRIVATE_EXPORT where appropriate and corrects the wrong include path for the double conversion code to actually be relative to the file it is included from. This worked by accident because of other include paths present in the build. Change-Id: I338583dad2f76300819af8ab0dae8e5724c84430 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* simplify host_build logic againOswald Buddenhagen2013-10-251-7/+1
| | | | | | | | | | qt_tool handles bootstrapping fully automatically. This reverts commit 0fc040ef70513ccaeb9e96f7ca05a3df4d6c7879, and adds some more. Change-Id: Icffcf7f487dbf660678c7ee622f94b1063fef7e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix build logic for host_build tools.Morten Johan Sørvig2013-09-211-1/+7
| | | | | | | | Link against bootstrap-private instead QtCore when cross-compiling. Change-Id: I7aeb9d693b0dd041aea72b6b3dcb8614a9a92b89 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Move the parser folder from src/qml/qml to src/qmlLars Knoll2013-08-081-1/+1
| | | | | Change-Id: I5e5684f5b98b00f791ade99c4cb6bc2ed880ad6a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* prepare for qt_module_pris.prf changesOswald Buddenhagen2013-06-101-2/+3
| | | | | Change-Id: Iba75fccfc143f09d443d50bc8dc75cde5739af9b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* optionally bootstrap QmlDevTools and qmlminOswald Buddenhagen2013-03-161-1/+8
| | | | | | | | | QmlDevTools is really meant for host tools (the two only ones using this being qmlmin in this repo and lupdate in qttools). qmake magic will take care of bootstrapping them while x-building. Change-Id: I29d921af483659d5455be0ad080dc1a88540c036 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I8a13b3aca195b9e8331478d73cd338ab66d65d1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Mark some declarative libraries as internal.Stephen Kelly2012-07-241-1/+1
| | | | | | | | | | | | The QtQuickParticles module is actually a QML plugin, even though it is installed to lib/, and it doesn't have useful public API. The QmlDevTools module is internal and non-stable API. This avoids creating CMake files for those modules. Change-Id: Iae7a66b18728d65aa6abd660365f0878bc6574a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Change CONFIG += staticlib to CONFIG += staticThiago Macieira2012-07-111-1/+1
| | | | | | | That's the targetted, correct way of defining a static library. Change-Id: Ib039e1872c190900c3c7ef1f2d2c4ca03743852c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-11/+2
| | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-2/+0
| | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix qmldevtools library build error on WindowsCharles Yin2012-03-191-1/+1
| | | | | | | $$Qt.qml.sources not recongnized on Windows, use relative path instead. Change-Id: Ia30acc34eff5193bea66ff06754b1cd2b2524878 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-1/+1
| | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Say hello to QtQmlDevTools libraryKent Hansen2011-10-071-0/+20
QtQmlDevTools is a private helper library. It provides QML/JS file parsing for tools that live outside of the qtdeclarative repository, such as lupdate. This allows us to remove qttools's dependency on the qtdeclarative sources. To use the library: QT += qmldevtools-private #include <private/qdeclarativejsparser_p.h> Change-Id: Ia43751b9be3d9fe05da03e65c6aca1cd9e3fdbbc Reviewed-on: http://codereview.qt-project.org/6116 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 09:48:53 +0000