forked from qt-creator/qt-creator
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.
This commit is contained in:
@@ -7,7 +7,7 @@ unix {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
|
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 {
|
unix {
|
||||||
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
|
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
|
||||||
|
@@ -148,7 +148,7 @@ QString CoreImpl::resourcePath() const
|
|||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
return QDir::cleanPath(QCoreApplication::applicationDirPath()+QLatin1String("/../Resources"));
|
return QDir::cleanPath(QCoreApplication::applicationDirPath()+QLatin1String("/../Resources"));
|
||||||
#else
|
#else
|
||||||
return QDir::cleanPath(QCoreApplication::applicationDirPath());
|
return QDir::cleanPath(QCoreApplication::applicationDirPath())+"/../share/qtcreator";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user