From 9cf1a49cd9c069dddfb9ecfc7e760d0f2fe8da4f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 24 Mar 2011 16:00:29 +0100
Subject: [PATCH] QmlProfiler: Only compile for Qt with private headers
installed
---
src/plugins/plugins.pro | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 35dfc285de0..952ab710bc3 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -44,8 +44,7 @@ SUBDIRS = plugin_coreplugin \
!win32 {
SUBDIRS += plugin_valgrindtoolbase \
- plugin_memcheck \
- plugin_qmlprofiler
+ plugin_memcheck
}
linux-* {
@@ -64,6 +63,7 @@ contains(QT_CONFIG, declarative) {
minQtVersion(4, 7, 1) {
SUBDIRS += plugin_qmldesigner
+ !win32:SUBDIRS += plugin_qmlprofiler
} else {
warning()
warning("QmlDesigner plugin has been disabled.")
@@ -262,11 +262,11 @@ plugin_analyzerbase.depends += plugin_projectexplorer
plugin_memcheck.depends = plugin_coreplugin
plugin_memcheck.depends += plugin_analyzerbase
plugin_memcheck.depends += plugin_valgrindtoolbase
-}
-plugin_qmlprofiler.subdir = qmlprofiler
-plugin_qmlprofiler.depends = plugin_coreplugin
-plugin_qmlprofiler.depends = plugin_analyzerbase
+ plugin_qmlprofiler.subdir = qmlprofiler
+ plugin_qmlprofiler.depends = plugin_coreplugin
+ plugin_qmlprofiler.depends = plugin_analyzerbase
+}
plugin_qmljstools.subdir = qmljstools
plugin_qmljstools.depends = plugin_projectexplorer
--
GitLab