aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/qtquick1.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-44/+0
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-241-10/+0
| | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Remove harfbuzz cruft from {declarative,qtquick1}.proKent Hansen2011-11-251-3/+0
| | | | | | | | | As of b97215b04c0bf12ecfd51ccdeaedd1fab5e8bc03 in qtbase, modules outside of qtbase can include private text headers without depending on the harfbuzz sources being present. Change-Id: Idb3d70d70c1f0f194382a405daa573e66146272a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Declarative: Add define _CRT_SECURE_NO_WARNINGS for MSVC.Friedemann Kleint2011-11-081-0/+2
| | | | | | | | | Silence warnings about usage of strcmp(), etc. Using wrapper is not an option here for performance reasons. Change-Id: Ia444a637080c910b8a9a888f422e65c812ba546c Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fixed compile on mac (workaround for build system bug)Rohan McGovern2011-09-151-0/+13
| | | | | | | | | | | | | | | | | When using QT += somemodule, and using frameworks on mac, qmake refuses to add `-framework somemodule' to the compiler flags unless the framework can be found on disk. This can easily break when compiling two frameworks out of the same source tree. In this case, if QtQuick1 were qmake'd prior to QtDeclarative being built (which is expected for a clean build), it would incorrectly put -lQtDeclarative into the link line even if QtDeclarative should be built as a framework. The problem would disappear if qmake was re-run. Change-Id: I79cbfc454e0ab564ce6597b4f7e613c1ff39473f Reviewed-on: http://codereview.qt-project.org/4938 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-2/+2
| | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-311-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * Remove V8 submodule from QtDeclarativeKent Hansen2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDeclarative should now link against the QtV8 library from qtbase. The patch files have been moved to qtbase as well. Applications that use the QtDeclarative private headers may need to add the following to their .pro file: QT += v8-private This ensures that <private/v8.h> is found, which is (indirectly) included by many QtDeclarative private headers. Task-number: QTBUG-20963 Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b Reviewed-on: http://codereview.qt.nokia.com/3093 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-111-2/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-291-1/+1
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+42
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 16:43:52 +0000