Commit Graph

12 Commits

Author SHA1 Message Date
Christian Kandeler
bdc26d9379 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:55:37 +02:00
Marco Bubke
7be0100298 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-22 12:27:07 +02:00
Eike Ziller
c63725ff66 Fix sources that are deployed into Qt Creator build for qml(2)puppet
When qml(2)puppet is built as part of Qt Creator, we need to generate
the Info.plist from Info.plist.in. When it is deployed as source into
the Qt Creator build, we need to do that too.

Change-Id: I83aa446f19984a51822c46df2ab7f41e78002ad4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-28 14:22:36 +02:00
Thomas Hartmann
b13a47f566 fixing Info.plist
info was missing a $$PWD/ in .pri files.

Change-Id: I01771021595c706514786c9d7b2991cc5d9f60cb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 16:44:35 +02:00
Marco Bubke
333cec5957 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-06-04 12:41:00 +02:00
Thomas Hartmann
e311761b57 Fix compilation for Mac OS X
CONFIG += c++11
does not work with clang atm.

Change-Id: I7750b333296ccedf999d2610cca126530f737777
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 11:23:33 +02:00
Marco Bubke
e13e6550f5 QmlDesigner: qml2puppet is using c++ support
Change-Id: Ie6ac96b713775db13a02cecdc74849ad97f017e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:15 +02:00
Kai Koehne
d1aa986735 Fix checks for qt modules
The fix in 823d48d218 had a typo
(Qt vs QT). Also fix other places where QT_CONFIG was used to
identify Qt modules.

Change-Id: Ie32b678b959f7b5573574ef87ae7ad92860e8323
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-26 16:41:54 +01:00
Thomas Hartmann
efb68b0938 QmlDesigner: fix compile for qml2puppet
Change-Id: I3fdb693d66eafc85357da138570d58586a57e592
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-07 12:45:02 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Thomas Hartmann
76759f2400 QmlDesigner: fix qml2puppet .pro file
Change-Id: I697a5e8d11b0aef926dd79a5e45a63ffdc567353
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-05 12:57:17 +02:00
Thomas Hartmann
b9e550f702 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-04 17:01:00 +02:00