From 9d52a72534443d0c440bbe575c0a3082fc84738a Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Tue, 10 Feb 2009 10:48:19 +0100
Subject: [PATCH] Made it possible to compile libCPlusPlus without `gui'.
---
src/libs/cplusplus/cplusplus-lib.pri | 20 +++++++++++++-------
tests/auto/cplusplus/lookup/lookup.pro | 5 ++++-
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index d3053228fc3..168fa881e68 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -3,14 +3,24 @@ INCLUDEPATH += $$PWD
include(../../shared/cplusplus/cplusplus.pri)
+contains(QT_CONFIG, gui) {
HEADERS += \
- $$PWD/SimpleLexer.h \
+ $$PWD/Icons.h \
$$PWD/ExpressionUnderCursor.h \
$$PWD/TokenUnderCursor.h \
+ $$PWD/OverviewModel.h
+
+SOURCES += \
+ $$PWD/Icons.cpp \
+ $$PWD/ExpressionUnderCursor.cpp \
+ $$PWD/TokenUnderCursor.cpp \
+ $$PWD/OverviewModel.cpp
+}
+
+HEADERS += \
+ $$PWD/SimpleLexer.h \
$$PWD/CppDocument.h \
- $$PWD/Icons.h \
$$PWD/Overview.h \
- $$PWD/OverviewModel.h \
$$PWD/NamePrettyPrinter.h \
$$PWD/TypeOfExpression.h \
$$PWD/TypePrettyPrinter.h \
@@ -27,12 +37,8 @@ HEADERS += \
SOURCES += \
$$PWD/SimpleLexer.cpp \
- $$PWD/ExpressionUnderCursor.cpp \
- $$PWD/TokenUnderCursor.cpp \
$$PWD/CppDocument.cpp \
- $$PWD/Icons.cpp \
$$PWD/Overview.cpp \
- $$PWD/OverviewModel.cpp \
$$PWD/NamePrettyPrinter.cpp \
$$PWD/TypeOfExpression.cpp \
$$PWD/TypePrettyPrinter.cpp \
diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro
index 5b68c169a8f..cd02b709575 100644
--- a/tests/auto/cplusplus/lookup/lookup.pro
+++ b/tests/auto/cplusplus/lookup/lookup.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+TEMPLATE = app
+CONFIG += qt warn_on console depend_includepath
+QT = core testlib
+
include(../../../../src/libs/cplusplus/cplusplus-lib.pri)
SOURCES += tst_lookup.cpp
--
GitLab