From 65b4f8b66a67a1c122fe317b75f98478598ba230 Mon Sep 17 00:00:00 2001 From: dt <qtc-committer@nokia.com> Date: Wed, 8 Sep 2010 12:15:15 +0200 Subject: [PATCH] Fix broken .pri files Do not include qtcreator.pri from _dependencies.pri --- src/plugins/bineditor/bineditor.pro | 2 +- src/plugins/bineditor/bineditor_dependencies.pri | 1 - src/plugins/classview/classview.pro | 2 +- src/plugins/classview/classview_dependencies.pri | 1 - src/plugins/imageviewer/imageviewer.pro | 2 +- src/plugins/imageviewer/imageviewer_dependencies.pri | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/bineditor/bineditor.pro b/src/plugins/bineditor/bineditor.pro index 5b0d628936a..e7986d27b6c 100644 --- a/src/plugins/bineditor/bineditor.pro +++ b/src/plugins/bineditor/bineditor.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = BinEditor - +include(../../qtcreatorplugin.pri) include(bineditor_dependencies.pri) HEADERS += bineditorplugin.h \ diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri index 5ccafe00072..b25886164cd 100644 --- a/src/plugins/bineditor/bineditor_dependencies.pri +++ b/src/plugins/bineditor/bineditor_dependencies.pri @@ -1,4 +1,3 @@ -include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/texteditor/texteditor.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro index d6de0d148ab..944ca84927c 100644 --- a/src/plugins/classview/classview.pro +++ b/src/plugins/classview/classview.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = ClassView - +include(../../qtcreatorplugin.pri) include(classview_dependencies.pri) HEADERS += \ diff --git a/src/plugins/classview/classview_dependencies.pri b/src/plugins/classview/classview_dependencies.pri index fd0ecfea3fc..19ddab5e9ad 100644 --- a/src/plugins/classview/classview_dependencies.pri +++ b/src/plugins/classview/classview_dependencies.pri @@ -1,4 +1,3 @@ -include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/cpptools/cpptools.pri) diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro index 879212095c4..ac296db1fa4 100644 --- a/src/plugins/imageviewer/imageviewer.pro +++ b/src/plugins/imageviewer/imageviewer.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = ImageViewer - +include(../../qtcreatorplugin.pri) include(imageviewer_dependencies.pri) HEADERS += \ diff --git a/src/plugins/imageviewer/imageviewer_dependencies.pri b/src/plugins/imageviewer/imageviewer_dependencies.pri index cd650c7aa7d..56b1dff3523 100644 --- a/src/plugins/imageviewer/imageviewer_dependencies.pri +++ b/src/plugins/imageviewer/imageviewer_dependencies.pri @@ -1,3 +1,2 @@ -include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/coreplugin/coreplugin.pri) -- GitLab