From 8c1d114dcfcc8b3d47505e3139151eec43ebbdc4 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 25 Mar 2011 22:16:12 +0000
Subject: Rockbox Utility: Replace OSDaB Zip with QuaZip.

This change fixes problems with zip files created with newer zip utilities (a
known issue is the iLike theme). QuaZip also allows better feedback during
operations without changing the imported code. Additionally Rockbox Utility and
the Theme Editor are now both using QuaZip; currently Rockbox Utility uses a
copy of the sources, merging them later is planned.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29645 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbutilqt.pri | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'rbutil/rbutilqt/rbutilqt.pri')

diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri
index 63d182a0ab..88977c1da3 100644
--- a/rbutil/rbutilqt/rbutilqt.pri
+++ b/rbutil/rbutilqt/rbutilqt.pri
@@ -22,8 +22,6 @@ SOURCES += \
  installwindow.cpp \
  base/httpget.cpp \
  configure.cpp \
- zip/zip.cpp \
- zip/unzip.cpp \
  base/zipinstaller.cpp \
  progressloggergui.cpp \
  installtalkwindow.cpp \
@@ -53,8 +51,6 @@ SOURCES += \
  base/rbsettings.cpp \
  base/serverinfo.cpp \
  base/systeminfo.cpp \
- base/rbunzip.cpp \
- base/rbzip.cpp \
  base/system.cpp \
  sysinfo.cpp \
  systrace.cpp \
@@ -71,6 +67,13 @@ SOURCES += \
  base/rockboxinfo.cpp \
  ../../tools/mkboot.c \
  ../../tools/iriver.c \
+ quazip/quazip.cpp \
+ quazip/quazipfile.cpp \
+ quazip/quazipnewinfo.cpp \
+ quazip/unzip.c \
+ quazip/zip.c \
+ quazip/ioapi.c \
+ base/ziputil.cpp \
 
 
 HEADERS += \
@@ -78,11 +81,6 @@ HEADERS += \
  installwindow.h \
  base/httpget.h \
  configure.h \
- zip/zip.h \
- zip/unzip.h \
- zip/zipentry_p.h \
- zip/unzip_p.h \
- zip/zip_p.h \
  version.h \
  base/zipinstaller.h \
  installtalkwindow.h \
@@ -120,8 +118,6 @@ HEADERS += \
  base/rbsettings.h \
  base/serverinfo.h \
  base/systeminfo.h \
- base/rbunzip.h \
- base/rbzip.h \
  sysinfo.h \
  base/system.h \
  systrace.h \
@@ -138,6 +134,16 @@ HEADERS += \
  base/rockboxinfo.h \
  ../../tools/mkboot.h \
  ../../tools/iriver.h \
+ quazip/crypt.h \
+ quazip/ioapi.h \
+ quazip/quazipfile.h \
+ quazip/quazipfileinfo.h \
+ quazip/quazip.h \
+ quazip/quazipnewinfo.h \
+ quazip/unzip.h \
+ quazip/zip.h \
+ base/ziputil.h \
+
 
 FORMS += \
  rbutilqtfrm.ui \
-- 
cgit