From a534a1e4d76138b3751d75a2c0fdf33f48d26e2a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin <daniel.molkentin@nokia.com> Date: Mon, 19 Jan 2009 11:01:45 +0100 Subject: [PATCH] More work toward make install on Linux. --- qtcreator.pro | 16 ++++++++++++++++ .../templates/qt4project/main.cpp | 0 .../templates/qt4project/mywidget.cpp | 0 .../templates/qt4project/mywidget.h | 0 .../templates/qt4project/mywidget_form.cpp | 0 .../templates/qt4project/mywidget_form.h | 0 .../templates/qt4project/widget.ui | 0 src/app/app.pro | 7 +++++++ src/qworkbench.pri | 8 +++++++- src/qworkbenchlibrary.pri | 5 +++++ src/qworkbenchplugin.pri | 7 +++++++ 11 files changed, 42 insertions(+), 1 deletion(-) rename share/{ => qtcreator}/templates/qt4project/main.cpp (100%) rename share/{ => qtcreator}/templates/qt4project/mywidget.cpp (100%) rename share/{ => qtcreator}/templates/qt4project/mywidget.h (100%) rename share/{ => qtcreator}/templates/qt4project/mywidget_form.cpp (100%) rename share/{ => qtcreator}/templates/qt4project/mywidget_form.h (100%) rename share/{ => qtcreator}/templates/qt4project/widget.ui (100%) diff --git a/qtcreator.pro b/qtcreator.pro index bde9c816c7c..faaa0709888 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -6,6 +6,22 @@ count(TOO_OLD_LIST, 1) { } +linux-* { + isEmpty( LOCATION ) { + LOCATION = /usr/share + } + documentation.files += doc/qtcreator.qch + documentation.path = $$LOCATION/share/qtcreator/doc/qtcreator + + share.files += share/qtcreator/* + share.parth = $$LOCATION/share/qtcreator + + + INSTALLS += \ + documentation \ + share +} + TEMPLATE = subdirs CONFIG += ordered diff --git a/share/templates/qt4project/main.cpp b/share/qtcreator/templates/qt4project/main.cpp similarity index 100% rename from share/templates/qt4project/main.cpp rename to share/qtcreator/templates/qt4project/main.cpp diff --git a/share/templates/qt4project/mywidget.cpp b/share/qtcreator/templates/qt4project/mywidget.cpp similarity index 100% rename from share/templates/qt4project/mywidget.cpp rename to share/qtcreator/templates/qt4project/mywidget.cpp diff --git a/share/templates/qt4project/mywidget.h b/share/qtcreator/templates/qt4project/mywidget.h similarity index 100% rename from share/templates/qt4project/mywidget.h rename to share/qtcreator/templates/qt4project/mywidget.h diff --git a/share/templates/qt4project/mywidget_form.cpp b/share/qtcreator/templates/qt4project/mywidget_form.cpp similarity index 100% rename from share/templates/qt4project/mywidget_form.cpp rename to share/qtcreator/templates/qt4project/mywidget_form.cpp diff --git a/share/templates/qt4project/mywidget_form.h b/share/qtcreator/templates/qt4project/mywidget_form.h similarity index 100% rename from share/templates/qt4project/mywidget_form.h rename to share/qtcreator/templates/qt4project/mywidget_form.h diff --git a/share/templates/qt4project/widget.ui b/share/qtcreator/templates/qt4project/widget.ui similarity index 100% rename from share/templates/qt4project/widget.ui rename to share/qtcreator/templates/qt4project/widget.ui diff --git a/src/app/app.pro b/src/app/app.pro index bc8376bbddb..e839964ba10 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -16,6 +16,13 @@ linux-* { ISGCC33=$$(GCC33) !equals(ISGCC33, 1):QT += svg dbus + isEmpty( LOCATION ) { + error("app.pro: including file must define LOCATION (didn't you run qmake from the root dir?)") + } + + binaries.files += bin/qtcreator + binaries.path = $$LOCATION/bin + } TEMPLATE = app diff --git a/src/qworkbench.pri b/src/qworkbench.pri index 1f842960842..b76b421802e 100644 --- a/src/qworkbench.pri +++ b/src/qworkbench.pri @@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) { } } +linux-* { + isEmpty( LOCATION ) { + error("qworkbench.pri: including file must define LOCATION (didn't you run qmake from the root dir?)") + } +} + equals(TEST, 1) { QT +=testlib DEFINES += WITH_TESTS @@ -20,7 +26,7 @@ macx { contains(QT_CONFIG, ppc):CONFIG += ppc x86 } else { IDE_APP_TARGET = qtcreator - IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib + IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/share/qtcreator/lib } IDE_APP_PATH = $$IDE_BUILD_TREE/bin win32 { diff --git a/src/qworkbenchlibrary.pri b/src/qworkbenchlibrary.pri index 1ef9b3fbec4..46f28f443e9 100644 --- a/src/qworkbenchlibrary.pri +++ b/src/qworkbenchlibrary.pri @@ -20,3 +20,8 @@ macx { TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + +linux-* { + target.path = $$LOCATION/lib/qtcreator + INSTALLS += target +} \ No newline at end of file diff --git a/src/qworkbenchplugin.pri b/src/qworkbenchplugin.pri index e598570259a..e689f6ed3b2 100644 --- a/src/qworkbenchplugin.pri +++ b/src/qworkbenchplugin.pri @@ -48,3 +48,10 @@ macx { contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + + + +linux-* { + target.path = $$LOCATION/lib/qtcreator/plugins + INSTALLS += target +} -- GitLab