diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-12-15 18:19:02 +0100 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-12-19 09:33:03 +0100 |
| commit | 99e3556a4c650f1e89e7e24ad85a7c2713f80fa6 (patch) | |
| tree | b590cb07d9098f8cd2793c177384ec0dd76ac87c | |
| parent | de875606e8bdda88bb9ca2105630d4907c157914 (diff) | |
| download | qt-creator-99e3556a4c650f1e89e7e24ad85a7c2713f80fa6.tar.gz | |
Install the debugging support (cdbext, qtcdebugger, qmlprofiler).
Required to deploy the lib upon 'make install'.
Change-Id: I1d6f02e5083dc0b1b34ece840509cb1094f9863c
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/libs/qtcreatorcdbext/qtcreatorcdbext.pro | 11 | ||||
| -rw-r--r-- | src/tools/qmlprofilertool/qmlprofilertool.pro | 3 | ||||
| -rw-r--r-- | src/tools/qtcdebugger/qtcdebugger.pro | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro index f9da7617b6..fa02ca4095 100644 --- a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro +++ b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro @@ -31,18 +31,19 @@ ENV_CPU=$$(CPU) ENV_LIBPATH=$$(LIBPATH) contains(ENV_CPU, ^AMD64$) { - DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}64 + DIRNAME=$${BASENAME}64 CDB_PLATFORM=amd64 } else:isEmpty(ENV_CPU):contains(ENV_LIBPATH, ^.*amd64.*$) { - DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}64 + DIRNAME=$${BASENAME}64 CDB_PLATFORM=amd64 } else { - DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}32 + DIRNAME=$${BASENAME}32 CDB_PLATFORM=i386 } LIBS+=-luser32 +DESTDIR=$$IDE_BASE_PATH/lib/$${DIRNAME} TARGET = $$BASENAME message("Compiling Qt Creator CDB extension $$TARGET $$DESTDIR for $$CDB_PLATFORM using $$CDB_PATH") @@ -80,3 +81,7 @@ HEADERS += extensioncontext.h \ containers.h \ knowntype.h \ symbolgroupnode.h + +target.path = /lib/$${DIRNAME} + +INSTALLS += target diff --git a/src/tools/qmlprofilertool/qmlprofilertool.pro b/src/tools/qmlprofilertool/qmlprofilertool.pro index 615ce066d5..35ff550bb1 100644 --- a/src/tools/qmlprofilertool/qmlprofilertool.pro +++ b/src/tools/qmlprofilertool/qmlprofilertool.pro @@ -22,5 +22,6 @@ HEADERS += \ commandlistener.h \ constants.h - +target.path=/bin +INSTALLS+=target diff --git a/src/tools/qtcdebugger/qtcdebugger.pro b/src/tools/qtcdebugger/qtcdebugger.pro index f7ae016d0c..1ae9c02773 100644 --- a/src/tools/qtcdebugger/qtcdebugger.pro +++ b/src/tools/qtcdebugger/qtcdebugger.pro @@ -5,3 +5,6 @@ TEMPLATE = app SOURCES += main.cpp DESTDIR=../../../bin + +target.path=/bin +INSTALLS+=target |