Commit 497843c9 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Utils: Fix qbs build.



Also remove superfluous "utils/tooltip" include path from both qmake
and qbs project files.

Change-Id: Ifa97984d462cbf1e344ff8ba0104353010e8c691
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
parent 7889241d
......@@ -30,7 +30,8 @@
#include "tipfactory.h"
#include "tipcontents.h"
#include "tips.h"
#include "qtcassert.h"
#include <utils/qtcassert.h>
#include <QVBoxLayout>
......
......@@ -31,7 +31,7 @@
#include "tipcontents.h"
#include "reuse.h"
#include "qtcassert.h"
#include <utils/qtcassert.h>
#include <QRect>
#include <QColor>
......
......@@ -34,7 +34,7 @@
#include "effects.h"
#include "reuse.h"
#include "hostosinfo.h"
#include <utils/hostosinfo.h>
#include <QString>
#include <QColor>
......
......@@ -4,7 +4,7 @@ dll {
DEFINES += QTCREATOR_UTILS_STATIC_LIB
}
INCLUDEPATH += $$PWD $$PWD/tooltip
INCLUDEPATH += $$PWD
QT += script network
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
......
......@@ -5,9 +5,6 @@ QtcLibrary {
name: "Utils"
cpp.defines: base.concat(["QTCREATOR_UTILS_LIB", "QT_NO_CAST_FROM_ASCII"])
cpp.includePaths: base.concat([
"tooltip"
])
Properties {
condition: qbs.targetOS == "windows"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment