Commit Graph

12 Commits

Author SHA1 Message Date
Eike Ziller
6b0be2d4a4 Revert "Fixing Info.plist.in for qmlobserver and qmldump"
The Info.plist.in files are actually handled by static.pro.
The projects should only be compiled from the deployed sources in the
build tree.

This reverts commit 30c602f458.

Change-Id: Ib63fb9e4db1c249817e59239029db7dd220ba5b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-28 14:22:45 +02:00
Thomas Hartmann
30c602f458 Fixing Info.plist.in for qmlobserver and qmldump
Since we use Info.plist.in we need QMAKE_SUBSTITUTES
and cannot use QMAKE_INFO_PLIST.
We manualy replicate the target logic.

Change-Id: I5b703d09db85457ba3bdadef97fd1cc2194b618f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 16:57:38 +02:00
con
530e7494dd Automatic versioning for the qml tools.
Reviewed-by: Thomas Hartmann
2011-03-29 17:54:52 +02:00
Kai Koehne
6507f5ff83 QmlObserver: Allow to compile it again in source
Make it possible (again) to compile qmlobserver in share/qtcreator.
However, build artifacts in there might result in a malfunctioning
qtc-qmlobserver!

Reviewed-by: Thorbjorn Lindeijer
2011-02-21 16:40:53 +01:00
Kai Koehne
fbca39aefd QmlJsDebug: Fix compilation on Linux, Mac
Use camel case for library name all over the place.
2011-02-21 11:44:34 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00
Kai Koehne
b0184e9187 QmlObserver: Fix compilation when no private headers are installed
Regression introduced in 17d11b7be3.
2011-01-13 10:45:00 +01:00
Kai Koehne
17d11b7be3 Update qmlobserver with latest qmlviewer patches
Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
2010-12-10 13:25:26 +01:00
Kai Koehne
0a8c34d382 QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging
Don't confuse users by two defines they have to comment in when
they just want to 'debug': Instead QMLJSDEBUGGER now activates
both the Js Debugger & and the QmlObserver services. Finetuning
can still be done by using the (undocumented) NO_JSDEBUGGER,
NO_QMLOBSERVER defines.
2010-10-13 16:52:58 +02:00
Lasse Holmstedt
2578810334 Debugging helpers: Preserve whole build log
Otherwise, users might only see parts of the build that succeeded, but
not the failed ones (depending on build order).

Reviewed-by: ckamm
2010-10-04 12:03:35 +02:00
Lasse Holmstedt
91c0df0689 Build QMLObserver and qmldump only in debug mode
The problem is that we actually should have both debug & release builds,
but we don't have detection at the moment which binary to use.
See QTCREATORBUG-2496

Reviewed-by: Thomas Hartmann
2010-09-29 10:57:16 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00