From 3e0f2b3e1c0d48a49c68170400babab768430da3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 29 Jan 2012 15:34:32 +0100 Subject: [PATCH] Use relative paths to quazip includes. Shorten the include list a bit by using relative paths. Change-Id: I91fa7b292179c9f8cd0c257ef9b8d26bca34963b --- rbutil/rbutilqt/base/ziputil.cpp | 6 +++--- rbutil/rbutilqt/base/ziputil.h | 6 +++--- rbutil/rbutilqt/rbutilqt.pro | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/rbutil/rbutilqt/base/ziputil.cpp index b9218a70bc..d70cf8c9b3 100644 --- a/rbutil/rbutilqt/base/ziputil.cpp +++ b/rbutil/rbutilqt/base/ziputil.cpp @@ -21,9 +21,9 @@ #include "ziputil.h" #include "progressloggerinterface.h" -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#include "quazip/quazip.h" +#include "quazip/quazipfile.h" +#include "quazip/quazipfileinfo.h" ZipUtil::ZipUtil(QObject* parent) : QObject(parent) diff --git a/rbutil/rbutilqt/base/ziputil.h b/rbutil/rbutilqt/base/ziputil.h index a6b0a8ca9c..5ea76a03a1 100644 --- a/rbutil/rbutilqt/base/ziputil.h +++ b/rbutil/rbutilqt/base/ziputil.h @@ -20,9 +20,9 @@ #define ZIPUTIL_H #include -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#include "quazip/quazip.h" +#include "quazip/quazipfile.h" +#include "quazip/quazipfileinfo.h" class ZipUtil : public QObject { diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 1f281cbce6..46a332ece4 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -145,7 +145,7 @@ QMAKE_EXTRA_TARGETS += lrelease # Needed by QT on Win INCLUDEPATH = $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \ - $$_PRO_FILE_PWD_/quazip $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base + $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher \ $$RBBASE_DIR/tools/rbspeex $$RBBASE_DIR/tools