Fixes: Implement make install target, Step 1

Details: Moving files so that the local layout corresponds to the layout pushed by make install.
Adjust Make target, modify the resource path of the loader to find the resources in the
right place. All pathes are still looked up relative to binaryPath(), libs are found via
relative rpath.

29 files changed, 2 insertions, 2 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 4207e364c7..bfcaaecf33 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -7,7 +7,7 @@ unix {
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
-QCH_FILE = $$OUT_PWD/doc/qtcreator.qch
+QCH_FILE = $$OUT_PWD/share/doc/qtcreator/qtcreator.qch
 
 unix {
 html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
diff --git a/bin/designer/templates.xml b/share/qtcreator/designer/templates.xml
index 738e31cf47..738e31cf47 100644
--- a/bin/designer/templates.xml
+++ b/share/qtcreator/designer/templates.xml
diff --git a/bin/designer/templates/Dialog_with_Buttons_Bottom.ui b/share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
index 18d31ab915..18d31ab915 100644
--- a/bin/designer/templates/Dialog_with_Buttons_Bottom.ui
+++ b/share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
diff --git a/bin/designer/templates/Dialog_with_Buttons_Right.ui b/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui
index 703d594f4f..703d594f4f 100644
--- a/bin/designer/templates/Dialog_with_Buttons_Right.ui
+++ b/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui
diff --git a/bin/designer/templates/Dialog_without_Buttons.ui b/share/qtcreator/designer/templates/Dialog_without_Buttons.ui
index 1be629818c..1be629818c 100644
--- a/bin/designer/templates/Dialog_without_Buttons.ui
+++ b/share/qtcreator/designer/templates/Dialog_without_Buttons.ui
diff --git a/bin/designer/templates/Main_Window.ui b/share/qtcreator/designer/templates/Main_Window.ui
index e324db8292..e324db8292 100644
--- a/bin/designer/templates/Main_Window.ui
+++ b/share/qtcreator/designer/templates/Main_Window.ui
diff --git a/bin/designer/templates/Widget.ui b/share/qtcreator/designer/templates/Widget.ui
index d03fae3871..d03fae3871 100644
--- a/bin/designer/templates/Widget.ui
+++ b/share/qtcreator/designer/templates/Widget.ui
diff --git a/bin/gdbmacros/GPL_EXCEPTION.TXT b/share/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
index 8fa94329fe..8fa94329fe 100644
--- a/bin/gdbmacros/GPL_EXCEPTION.TXT
+++ b/share/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
diff --git a/bin/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 7a304607b6..7a304607b6 100644
--- a/bin/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
diff --git a/bin/gdbmacros/gdbmacros.pro b/share/qtcreator/gdbmacros/gdbmacros.pro
index bd1c07b968..bd1c07b968 100644
--- a/bin/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/gdbmacros/gdbmacros.pro
diff --git a/bin/license.txt b/share/qtcreator/license.txt
index e965c1d70f..e965c1d70f 100644
--- a/bin/license.txt
+++ b/share/qtcreator/license.txt
diff --git a/bin/runInTerminal.command b/share/qtcreator/runInTerminal.command
index 372820c1b1..372820c1b1 100755
--- a/bin/runInTerminal.command
+++ b/share/qtcreator/runInTerminal.command
diff --git a/bin/schemes/MS_Visual_C++.kms b/share/qtcreator/schemes/MS_Visual_C++.kms
index 696b96bb42..696b96bb42 100644
--- a/bin/schemes/MS_Visual_C++.kms
+++ b/share/qtcreator/schemes/MS_Visual_C++.kms
diff --git a/bin/schemes/Xcode.kms b/share/qtcreator/schemes/Xcode.kms
index 30653822df..30653822df 100644
--- a/bin/schemes/Xcode.kms
+++ b/share/qtcreator/schemes/Xcode.kms
diff --git a/bin/snippets/class_generic.snp b/share/qtcreator/snippets/class_generic.snp
index 1f196c3dac..1f196c3dac 100644
--- a/bin/snippets/class_generic.snp
+++ b/share/qtcreator/snippets/class_generic.snp
diff --git a/bin/snippets/class_qobject.snp b/share/qtcreator/snippets/class_qobject.snp
index 784233e546..784233e546 100644
--- a/bin/snippets/class_qobject.snp
+++ b/share/qtcreator/snippets/class_qobject.snp
diff --git a/bin/snippets/class_qwidget.snp b/share/qtcreator/snippets/class_qwidget.snp
index 1edb2d2cc7..1edb2d2cc7 100644
--- a/bin/snippets/class_qwidget.snp
+++ b/share/qtcreator/snippets/class_qwidget.snp
diff --git a/bin/snippets/comment.snp b/share/qtcreator/snippets/comment.snp
index bd909a7e7a..bd909a7e7a 100644
--- a/bin/snippets/comment.snp
+++ b/share/qtcreator/snippets/comment.snp
diff --git a/bin/snippets/for.snp b/share/qtcreator/snippets/for.snp
index 16aa633faf..16aa633faf 100644
--- a/bin/snippets/for.snp
+++ b/share/qtcreator/snippets/for.snp
diff --git a/bin/snippets/foreach.snp b/share/qtcreator/snippets/foreach.snp
index c00beb99e5..c00beb99e5 100644
--- a/bin/snippets/foreach.snp
+++ b/share/qtcreator/snippets/foreach.snp
diff --git a/bin/snippets/if.snp b/share/qtcreator/snippets/if.snp
index 2888590efa..2888590efa 100644
--- a/bin/snippets/if.snp
+++ b/share/qtcreator/snippets/if.snp
diff --git a/bin/snippets/ifelse.snp b/share/qtcreator/snippets/ifelse.snp
index 39428555ca..39428555ca 100644
--- a/bin/snippets/ifelse.snp
+++ b/share/qtcreator/snippets/ifelse.snp
diff --git a/bin/templates/qt4project/main.cpp b/share/templates/qt4project/main.cpp
index e1e39f6f26..e1e39f6f26 100644
--- a/bin/templates/qt4project/main.cpp
+++ b/share/templates/qt4project/main.cpp
diff --git a/bin/templates/qt4project/mywidget.cpp b/share/templates/qt4project/mywidget.cpp
index ae355e98dd..ae355e98dd 100644
--- a/bin/templates/qt4project/mywidget.cpp
+++ b/share/templates/qt4project/mywidget.cpp
diff --git a/bin/templates/qt4project/mywidget.h b/share/templates/qt4project/mywidget.h
index 88ee4d9506..88ee4d9506 100644
--- a/bin/templates/qt4project/mywidget.h
+++ b/share/templates/qt4project/mywidget.h
diff --git a/bin/templates/qt4project/mywidget_form.cpp b/share/templates/qt4project/mywidget_form.cpp
index 33b14afab8..33b14afab8 100644
--- a/bin/templates/qt4project/mywidget_form.cpp
+++ b/share/templates/qt4project/mywidget_form.cpp
diff --git a/bin/templates/qt4project/mywidget_form.h b/share/templates/qt4project/mywidget_form.h
index fd4d373277..fd4d373277 100644
--- a/bin/templates/qt4project/mywidget_form.h
+++ b/share/templates/qt4project/mywidget_form.h
diff --git a/bin/templates/qt4project/widget.ui b/share/templates/qt4project/widget.ui
index 6c78aeebc4..6c78aeebc4 100644
--- a/bin/templates/qt4project/widget.ui
+++ b/share/templates/qt4project/widget.ui
diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index 9f8ec24b57..e9a3799d62 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/src/plugins/coreplugin/coreimpl.cpp
@@ -148,7 +148,7 @@ QString CoreImpl::resourcePath() const
 #if defined(Q_OS_MAC)
     return QDir::cleanPath(QCoreApplication::applicationDirPath()+QLatin1String("/../Resources"));
 #else
-    return QDir::cleanPath(QCoreApplication::applicationDirPath());
+    return QDir::cleanPath(QCoreApplication::applicationDirPath())+"/../share/qtcreator";
 #endif
 }