diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 14:56:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 16:05:03 +0200 |
| commit | a896d4b39ec3d45ba708d9b36ea9c864b1df2136 (patch) | |
| tree | 45cfe153cce6114c2c76c48dc0bdabde2a8cf3e3 /tools | |
| parent | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (diff) | |
| parent | 65bfc35429e845cf6b76d58107360a1360a654fc (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/v4/qv4bindings.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
src/quick/qtquick2.cpp
Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlprofiler/qmlprofiler.pro | 2 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro index b90554455f..7ab61e7a96 100644 --- a/tools/qmlprofiler/qmlprofiler.pro +++ b/tools/qmlprofiler/qmlprofiler.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = qmlprofiler DESTDIR = $$QT.qml.bins -QT += qml qml-private network core-private +QT += qml qml-private v8-private network core-private target.path = $$[QT_INSTALL_BINS] INSTALLS += target diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 3e63bd7659..464f9b3758 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -14,4 +14,4 @@ SOURCES += main.cpp CONFIG += console -DEFINES += QML_RUNTIME_TESTING QT_DECLARATIVE_DEBUG_NO_WARNING +DEFINES += QML_RUNTIME_TESTING QT_QML_DEBUG_NO_WARNING |