summaryrefslogtreecommitdiffstats
path: root/src/declarative/declarative.pro
Commit message (Collapse)AuthorAgeFilesLines
* make use of qtHaveModule()Oswald Buddenhagen2013-01-281-1/+1
| | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless harfbuzz includeOswald Buddenhagen2012-12-191-1/+0
| | | | | Change-Id: Ie2aa164eeb265a52a59da080f51e29aeaf77083b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-171-4/+4
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Compile without xmlpatterns again.Daniel Molkentin2012-09-051-0/+1
| | | | | Change-Id: I1cb9d92c60e8595432c1a13866c370e040553a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use qtxmlpatterns only if it is availableYuchen Deng2012-08-141-1/+1
| | | | | Change-Id: I6a84f8b35f26fbe44b51ecf4f38aa2619996e83a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-141-3/+1
| | | | | Change-Id: Ia65d09d850a58e66db2d6d2a25703725283dbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-141-1/+1
| | | | | Change-Id: I1d1be313492c311aaaf6a87dd96d56d08feb097e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix install path of folderlistmodel particles and shader import pluginsAndrew den Exter2012-08-011-1/+0
| | | | | | | | | | | | | | 19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 added QtQuick1 to both the base path of QtQuick 1 imports and the target paths of individual plugins leading to a duplication of QtQuick1 in the final path. Remove the suffix from the root destination directory as the plugins still need to explicity include it in the install path and it's better if there's a single relative target path used in the .pro files. Task-number: QTBUG-26707 QTBUG-26701 Change-Id: I79ee28fc5b6ef549cf3c5f71585756149f0f8ff3 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-7/+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 Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-3/+5
| | | | | Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove QtSvg library use.Toby Tomkins2012-06-261-1/+0
| | | | | | | | | Changes in the build system causes the header of this library to be included incorrectly. This library was never a hard dependancy for qtquick1. Change-Id: If28d4fcd7879c04772158f1e03da6e05c6f21928 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Define Q_QUICK1_EXPORT independentlyMatthew Vogt2012-02-271-1/+5
| | | | | | | | | | | | Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the qtquick1 module rather than using the definition in qtbase. This change undefines the definitions from qglobal.h; the undef should be removed once the definitions have been expunged from qtbase itself. Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix build issues related to QT_NO_*MODULE* defines.Andrew den Exter2012-02-221-1/+1
| | | | | | | | | | The QT_NO_XMLPATTERNS and QT_NO_CONCURRENT defines don't exist in Qt5 check for the existance of the modules with QT_XMLPATTERNS_LIB and QT_CONCURRENT_LIB instead of their absence with the old defines. Change-Id: I52bc9932294fe4564e58d06766301e2a0c41f15c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-311-20/+14
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-301-0/+43
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 00:01:39 +0000