diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-21 12:09:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 07:40:56 +0200 |
| commit | 3553c3b5517b0e9d5c8b78aa9ca8de33486b9894 (patch) | |
| tree | 488e8b7be558056830419015bb0618d4c8b855bb | |
| parent | 4629dc71525a638c0bae89ad67990a1ff14ea9c4 (diff) | |
| download | qtscript-3553c3b5517b0e9d5c8b78aa9ca8de33486b9894.tar.gz | |
don't reference $$QT_SOURCE/BUILD_TREE - they're unavailable here
Change-Id: I88316acb4cfc867689dfa636dd7554ac0976275f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 3b83ac6..0b9bf11 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -69,8 +69,8 @@ contains(JAVASCRIPTCORE_JIT,no) { } wince* { - INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat - SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c + INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat + SOURCES += $$QT.core.sources/../3rdparty/ce-compat/ce_time.c DEFINES += WINCEBASIC } diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro index 5db52ab..c42f9fc 100644 --- a/src/plugins/script/qtdbus/qtdbus.pro +++ b/src/plugins/script/qtdbus/qtdbus.pro @@ -1,6 +1,7 @@ load(qt_module) TARGET = qtscriptdbus +DESTDIR = $$QT.script.plugins/script load(qt_plugin) QT = core gui script CONFIG += qdbus @@ -8,6 +9,5 @@ CONFIG += qdbus SOURCES += main.cpp HEADERS += main.h -DESTDIR = $$QT_BUILD_TREE/plugins/script target.path += $$[QT_INSTALL_PLUGINS]/script INSTALLS += target diff --git a/tests/benchmarks/script/context2d/context2d.pro b/tests/benchmarks/script/context2d/context2d.pro index 4de78da..2dc8536 100644 --- a/tests/benchmarks/script/context2d/context2d.pro +++ b/tests/benchmarks/script/context2d/context2d.pro @@ -4,7 +4,7 @@ TARGET = tst_bench_context2d SOURCES += tst_context2d.cpp -CONTEXT2D_EXAMPLE_DIR = $$QT_SOURCE_TREE/examples/script/context2d +CONTEXT2D_EXAMPLE_DIR = ../../../../examples/script/context2d INCLUDEPATH += $$CONTEXT2D_EXAMPLE_DIR HEADERS += $$CONTEXT2D_EXAMPLE_DIR/qcontext2dcanvas.h \ diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro index 6b0f6dc..33f200d 100644 --- a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro +++ b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro @@ -5,6 +5,6 @@ TARGET = tst_bench_qscriptclass_bytearray SOURCES += tst_qscriptclass_bytearray.cpp RESOURCES += qscriptclass_bytearray.qrc -include($$QT_SOURCE_TREE/examples/script/customclass/bytearrayclass.pri) +include(../../../../examples/script/customclass/bytearrayclass.pri) QT = core script testlib |