Fix includes and library pathes

qtcreator's included .pri file does the hard work already, we just need to
supply the right variables, IDE_BUILD_TREE and IDE_LIBRARY_BASENAME.

Author: palacaze

Diff for: doxygen.cpp

@@ -23,25 +23,25 @@
 #include "doxygenfilesdialog.h"
 
 #include <QObject>
-#include <plugins/cppeditor/cppeditorconstants.h>
-#include <plugins/cpptools/cpptoolsconstants.h>
-#include <plugins/cpptools/cppmodelmanager.h>
-#include <plugins/texteditor/texteditor.h>
-#include <plugins/coreplugin/icore.h>
-#include <plugins/coreplugin/editormanager/ieditor.h>
-#include <plugins/coreplugin/editormanager/editormanager.h>
-#include <plugins/coreplugin/editormanager/editorview.h>
-#include <plugins/projectexplorer/project.h>
-#include <plugins/projectexplorer/projectexplorer.h>
-#include <plugins/projectexplorer/session.h>
-#include <plugins/projectexplorer/projectexplorerconstants.h>
-#include <plugins/projectexplorer/projecttree.h>
-#include <libs/cplusplus/Overview.h>
-#include <libs/extensionsystem/pluginmanager.h>
+#include <cppeditor/cppeditorconstants.h>
+#include <cpptools/cpptoolsconstants.h>
+#include <cpptools/cppmodelmanager.h>
+#include <texteditor/texteditor.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/editorview.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projecttree.h>
 #include <cplusplus/Scope.h>
 #include <cplusplus/Symbols.h>
 #include <cplusplus/Names.h>
 #include <cplusplus/CppDocument.h>
+#include <cplusplus/Overview.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QString>
 #include <QStringList>

Diff for: doxygen.h

@@ -21,12 +21,13 @@
 
 #ifndef DOXYGEN_H
 #define DOXYGEN_H
-#include <libs/3rdparty/cplusplus/Symbols.h>
-#include "doxygensettingsstruct.h"
-#include <plugins/projectexplorer/project.h>
-#include <plugins/coreplugin/icore.h>
-#include <plugins/coreplugin/editormanager/ieditor.h>
+
+#include <3rdparty/cplusplus/Symbols.h>
+#include <projectexplorer/project.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <QProgressDialog>
+#include "doxygensettingsstruct.h"
 
 namespace DoxyPlugin {
 namespace Internal {

Diff for: doxygen.pro

@@ -36,6 +36,13 @@ IDE_BUILD_TREE = $$(QTC_BUILD)
 unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=$$(HOME)/qtcreator-3.6.0
 win32:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=D:\src\build-qtcreator-5_5_1_msvc2013-Release
 
+## set the QTC_LIB_BASENAME environment variable to override the setting here
+## this variable points to the library installation path, relative to IDE_BUILD_TREE,
+## so that $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator will be used by
+## qtcreatorplugin.pri automatically as the qtcreator library path
+IDE_LIBRARY_BASENAME = $$(QTC_LIB_BASENAME)
+unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=usr/lib/x86_64-linux-gnu
+
 ## uncomment to build plugin into user config directory
 ## <localappdata>/plugins/<ideversion>
 ##    where <localappdata> is e.g.
@@ -66,11 +73,5 @@ QTC_PLUGIN_RECOMMENDS += \
 
 include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
 
-INCLUDEPATH += $$QTCREATOR_SOURCES/src
-linux-g++-64 {
-    LIBS += -L/usr/lib/x86_64-linux-gnu/qtcreator \
-            -L/usr/lib/x86_64-linux-gnu/qtcreator/plugins
-}
-
 DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 

Diff for: doxygenplugin.cpp

@@ -31,20 +31,18 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-
-#include <plugins/cppeditor/cppeditorconstants.h>
-#include <plugins/cpptools/cpptoolsconstants.h>
-#include <plugins/projectexplorer/project.h>
-#include <plugins/projectexplorer/projectexplorer.h>
-#include <plugins/projectexplorer/session.h>
-#include <plugins/projectexplorer/projectexplorerconstants.h>
-#include <plugins/projectexplorer/projecttree.h>
-
-#include <libs/utils/qtcassert.h>
-#include <libs/utils/synchronousprocess.h>
-#include <libs/utils/parameteraction.h>
-#include <libs/extensionsystem/pluginmanager.h>
+#include <cppeditor/cppeditorconstants.h>
+#include <cpptools/cpptoolsconstants.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projecttree.h>
+
+#include <utils/qtcassert.h>
+#include <utils/synchronousprocess.h>
+#include <utils/parameteraction.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QAction>
 #include <QMessageBox>

Diff for: doxygensettings.cpp

@@ -23,8 +23,8 @@
 #include "doxygen.h"
 #include "doxygenplugin.h"
 #include "doxygenconstants.h"
-#include <plugins/coreplugin/icore.h>
-#include <libs/utils/qtcassert.h>
+#include <coreplugin/icore.h>
+#include <utils/qtcassert.h>
 #include <QtCore/QCoreApplication>
 #include <QIcon>
 

Diff for: doxygensettingswidget.h

@@ -23,7 +23,7 @@
 #define DOXYGENSETTINGSWIDGET_H
 
 #include <QWidget>
-#include <libs/utils/pathchooser.h>
+#include <utils/pathchooser.h>
 #include "doxygensettingsstruct.h"
 
 using namespace DoxyPlugin;