feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
f2f1fc860192367533cf91b37f5eed262bd745da
qt-creator/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

47 lines
1.5 KiB
Plaintext
Raw Normal View History

QmlDesigner: V8 is not anymore present in 5.2 Change-Id: Ie154a02719f4706b9edc872767b137fe6f9977bc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-21 15:25:36 +02:00
QT += core gui widgets qml quick network
Remove script-private dependency from qml2puppet Change-Id: If040844310105970f645f413cfc005abdb95994c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-17 12:33:29 +01:00
QT += core-private qml-private quick-private gui-private
QmlDesigner: V8 is not anymore present in 5.2 Change-Id: Ie154a02719f4706b9edc872767b137fe6f9977bc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-21 15:25:36 +02:00
QmlDesigner: Bump the C++ version to 17 for the qml puppet too Task-number: QTCREATORBUG-24684 Change-Id: I2502593d45f93b36162a4009cca238a83da2dc53 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-07 09:11:49 +02:00
CONFIG += c++17
qml2puppet: Fix build with MinGW Which was broken in 5daee38e. Change-Id: Ic43ed4528cb5e2c831e07b17a2ee118583b54526 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-11 23:43:35 +01:00
win32:!mingw: QMAKE_CXXFLAGS += /std:c++17
QmlDesigner: On demand compilation of the puppet Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-09 12:55:53 +02:00
Do not set the QT_CREATOR macro for the QML puppet. It's not Qt Creator. And otherwise the build breaks with a namespaced Qt. Change-Id: Ib30ef86fbc59a02f6fd60d2f0b0b8f4ab452ef6d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 16:17:54 +02:00
DEFINES -= QT_CREATOR
QmlDesigner: create stub project to build qml2puppet This allows building qml2puppet as part of Qt Creator, if Qt Creator is based on Qt 5. For the moment it has to be build manually. Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 16:09:16 +02:00
qmlpuppet: improve text Change-Id: Ibd1b7cd783561bc0b1e853e8875ee631eddb85d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-12 10:29:48 +02:00
# This .pri file contains classes to enable a special multilanguage translator
qmlpuppet: enable the use of multilanguage database Change-Id: I2277348ac1e6b5025e75c640da83da30294c9d10 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-18 23:39:18 +02:00
MULTILANGUAGE_SUPPORT_PRI=$$(MULTILANGUAGE_SUPPORT_PRI)
!isEmpty(MULTILANGUAGE_SUPPORT_PRI) {
qmlpuppet: improve text Change-Id: Ibd1b7cd783561bc0b1e853e8875ee631eddb85d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-12 10:29:48 +02:00
exists($$(MULTILANGUAGE_SUPPORT_PRI)): message(including \"$$(MULTILANGUAGE_SUPPORT_PRI)\")
else: error("MULTILANGUAGE_SUPPORT_PRI: \"$$(MULTILANGUAGE_SUPPORT_PRI)\" does not exist.")
qmlpuppet: enable the use of multilanguage database Change-Id: I2277348ac1e6b5025e75c640da83da30294c9d10 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-18 23:39:18 +02:00
include($$(MULTILANGUAGE_SUPPORT_PRI))
DEFINES += MULTILANGUAGE_TRANSLATIONPROVIDER
}
Add edit camera controls for 3D edit view Add edit camera controls and grid helper to 3D edit view. Task-number: QDS-1127 Change-Id: Ice5ea0fcca18d59dc8a2907710e16c6688b90628 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-10-15 14:54:20 +03:00
include (editor3d/editor3d.pri)
QmlDesigner: create stub project to build qml2puppet This allows building qml2puppet as part of Qt Creator, if Qt Creator is based on Qt 5. For the moment it has to be build manually. Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 16:09:16 +02:00
include (../instances/instances.pri)
include (instances/instances.pri)
include (../commands/commands.pri)
include (../container/container.pri)
include (../interfaces/interfaces.pri)
QmlDesigner: Refactor enumeration handling Change-Id: I0e163147a0303741af52127ece6f6afd0d2aa658 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-16 12:50:32 +01:00
include (../types/types.pri)
Qml2Puppet: Introduce QmlPrivateGate The goal is to avoid direct usage of private API. Any access to private QML API is supposed to go through QmlPrivateGate. NodeInstanceMetaObject is moved into QmlPrivateGate and renamed to just MetaObject. Change-Id: Iba0b574605e455b01e7b86306ec3ca47be7b4e58 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 13:11:39 +02:00
include (../qmlprivategate/qmlprivategate.pri)
QmlDesigner: Create thumbnail for imported 3D assets Qmlpuppet now allows creating icon from qml source code. Invoke qmlpuppet with following arguments to create icons: --rendericon <size> <icon file name> <icon qml source> E.g. --rendericon 24 ~/my_icon.png ~/my_icon.qml Two icons are created, one with size x size dimensions and one with double the dimensions and "@2x" injected into the file name. 3D asset import utilizes this icon rendering to produce item library icons for imported components. Change-Id: I92c62c80d961f5f61a0ce1c09b32bbcbf80ea56c Fixes: QDS-1052 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-24 13:51:16 +02:00
include (iconrenderer/iconrenderer.pri)
QmlDesigner: Move 3D asset import to puppet Moved 3D asset import to puppet to ensure import always uses the correct version of the QtQuick3D. Fixes: QDS-3154 Change-Id: I630a833e7231383b87bf8b7214d3545d12de15ab Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-01-22 17:51:46 +02:00
include (import3d/import3d.pri)
QmlDesigner: create stub project to build qml2puppet This allows building qml2puppet as part of Qt Creator, if Qt Creator is based on Qt 5. For the moment it has to be build manually. Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 16:09:16 +02:00
QmlDesigner: Change main.cpp in qmlpuppetmain.cpp To better find it in the qt creator locator. Change-Id: Icfc7b400ee972802471a7a52f8552bb0fd41acdb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-30 16:11:14 +02:00
SOURCES += $$PWD/qml2puppetmain.cpp
QmlDesigner: create stub project to build qml2puppet This allows building qml2puppet as part of Qt Creator, if Qt Creator is based on Qt 5. For the moment it has to be build manually. Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 16:09:16 +02:00
RESOURCES += $$PWD/../qmlpuppet.qrc
QmlPuppet: Add separate set of qml files for Qt6 for 3D editor Import QtQuick3D 1.15 no longer works in Qt 6.2, so provide a separate set of qml files for each major Qt version. Fixes: QDS-4642 Change-Id: I3e17fb248f71f87fb9a40dcad3c03e037cafb0f4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-28 14:04:43 +03:00
versionAtLeast(QT_VERSION, 6.0.0): RESOURCES += $$PWD/../editor3d_qt6.qrc
else: RESOURCES += $$PWD/../editor3d_qt5.qrc
use DISTFILES instead of OTHER_FILES in creator's own build system it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 14:34:28 +02:00
DISTFILES += Info.plist
QmlDesigner: On demand compilation of the puppet Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-09 12:55:53 +02:00
No need for -lrt and -ldl on OpenBSD Change-Id: I33b29016daa950ab88632ffbc5cf54dde4c6eafa Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-01-18 11:32:56 +01:00
unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
QmlDesigner: On demand compilation of the puppet Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-09 12:55:53 +02:00
QmlDesigner: Use a POSIX shared memory for unix QSharedMemory is using SVR4 shared memory for unix which is limited to 4 MB globally which is really hurting the performance for the designer. POSIX shared memory is lifting some of this constraints but still has some bugs on Max OS but generally works better. Change-Id: I74c1ffd56495f408cd9340cd159190a1175a4086 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-31 16:45:21 +02:00
osx {
QmlDesigner: On demand compilation of the puppet Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-09 12:55:53 +02:00
CONFIG -= app_bundle
Fix linking with the Intel Compiler for OS X ICC does not understand the -sectcreate option. Since this is really just a linker option, use -Wl to pass it to the linker. This works with Clang too. Change-Id: I3edff1a856ba235a60984c745fc144b4046cad77 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-10-30 14:39:35 -07:00
QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$system_quote($$PWD/Info.plist)
QmlDesigner: create stub project to build qml2puppet This allows building qml2puppet as part of Qt Creator, if Qt Creator is based on Qt 5. For the moment it has to be build manually. Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 16:09:16 +02:00
}
Support make install also on OS X It can be helpful, is not much effort, and parts did not restrict the install target to non-OS X already. Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2015-09-04 13:11:54 +02:00
osx: target.path = $$INSTALL_LIBEXEC_PATH/qmldesigner
else: target.path = $$INSTALL_LIBEXEC_PATH
INSTALLS += target
Copy Permalink