aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene/qmlscene.pro
Commit message (Collapse)AuthorAgeFilesLines
* Adjust QMAKE_TARGET_PRODUCT, QMAKE_TARGET_DESCRIPTIONKai Koehne2017-07-281-2/+1
| | | | | | | | | | The product should be Qt5 (the default). The QMAKE_TARGET_DESCRIPTION is actually less than a description but a beautified name, that is shown e.g. in the task manager, crash reporting tool etc. Make it title case, like most Windows applications do. Change-Id: I570aee2c2016e78fdb7a93c2d7a66b70fdcb0cff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove custom setting of qmake VERSION field in toolsKai Koehne2017-07-281-6/+0
| | | | | | | | qt_tool.prf sets the VERSION to MODULE_VERSION by default. Also, qmake automatically makes it a quadruple for the .rc file metadata. Change-Id: Ie2d0f2022c4416ce824a6786eef4a8c461ed70f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Tools: Add product name, version and description to the .pro filesFriedemann Kleint2017-01-311-0/+9
| | | | | | | | This information will then be visible in Windows explorer. Change-Id: I9d2f936584308394b4e3246d57bed44083b3cbca Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* Don't set QT_QML_DEBUG_NO_WARNING on -no-qml-debugUlf Hermann2016-07-261-1/+2
| | | | | | | It won't work anyway. Change-Id: I2bc8f6b1b72cf30f0314ad551838db4f04c11297 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Enable GL context sharing for QtQuick windows by defaultSimon Hausmann2014-03-291-1/+1
| | | | | | | | | | | This is required for running QWebEngine inside qmlscene. It can be disabled with --disable-context-sharing and it remains off in QtQuick. Instead apps have to use QWebEngine API to enable this, where this patch here is merely convenience. Change-Id: I123893a7c8c644c49c66fe2b42d2b7b2e03622d9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* suppress qml import scan for the tools which don't need itOswald Buddenhagen2013-10-211-0/+1
| | | | | Change-Id: Iefdaf60edbe47d2941a0696d96e7b79a67b46d8d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-011-2/+0
| | | | | Change-Id: Ia07dc830586fd30f4ee98c64e9f2accae5cf2f06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* "export" the qml tools for qtPrepareTool() useOswald Buddenhagen2012-07-111-9/+2
| | | | | | | | | | notably, this disables the build of qmlplugindumpd.exe under windows - it is not clear to me why somebody would want to do that, as both sets of libraries would be available, and the output from both variants should be the same. Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Enabled widget free compilation of QtQuickDonald Carr2012-04-181-1/+1
| | | | | | | | | | There is no hard dependency of QtQuick on QWidget. This change makes the minor adjustments required to remove the build dependency altogether. This patch follows the path of least resistance bypassing any elements with a dependency on the legacy QWidget functionality. Change-Id: Ie3f47d3b4f60a1460dbb5d76a494a2c329469cc0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Debugger: Use "QML" also in macro namesKai Koehne2012-03-301-1/+1
| | | | | | | | QT_DECLARATIVE_DEBUG will be removed as soon as qtbase is updated. Change-Id: I9dbfe95b8bcb3bf1502319a040a758389b6977a2 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Allow enabling of qml debugger without startup warningKai Koehne2012-03-271-2/+2
| | | | | | | | | | | Add QT_DECLARATIVE_DEBUG_NO_WARNING define to support enabling the qml debugger without printing the usual startup warning. This should be used with care, but e.g. for qmlscene the warning probably confuses more than it helps. Change-Id: I33704857baebfc8bca60abbff09138e259390b49 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-2/+2
| | | | | | | | | | | | | 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>
* Add slow animations mode to qmlsceneAaron Kennedy2012-02-141-1/+1
| | | | | Change-Id: I0f850258e2cf5363bca2fa1c8b098aa5982eb232 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Link against widgets only when availableGunnar Sletta2011-12-121-1/+1
| | | | | Change-Id: Id7c474fe48bfa99d765267c0e3be1cbf80597548 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Cleaned up the qmlscene code a bitGunnar Sletta2011-12-061-1/+2
| | | | | Change-Id: I2aed4786e5426a7f05acced39ef849c03f1ab935 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-261-4/+0
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | 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>
* Respect $$QT.declarative.binsRohan McGovern2011-08-111-1/+1
| | | | | | | | | | A module's tools should build directly into $$QT.<module>.bins, just like its libraries and plugins. Change-Id: Ic5e885ae0fe99220e07fd643d9bb5b28008e0fa5 Reviewed-on: http://codereview.qt.nokia.com/2802 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-021-1/+1
| | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-1/+1
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* added private headers to qmlsceneGunnar Sletta2011-05-041-1/+1
|
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+20
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469