diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
| commit | 51afc1eb8ebc101ced5874eeadd73d5dfb8612bb (patch) | |
| tree | 0f85822e97b9b1fb63a8792c2b9b85ab982270b1 /src/libs/installer/installer.pro | |
| parent | e89721bce16d6486e47b5b88d24467face5a11aa (diff) | |
| parent | 8c9831108a2aa591908b9548dec911dbefa4fffb (diff) | |
Merge remote-tracking branch 'origin/1.6'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
Diffstat (limited to 'src/libs/installer/installer.pro')
| -rw-r--r-- | src/libs/installer/installer.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index ac55883b2..3d1f5a9e7 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -43,7 +43,6 @@ HEADERS += packagemanagercore.h \ binaryformatengine.h \ binaryformatenginehandler.h \ repository.h \ - zipjob.h \ utils.h \ errors.h \ component.h \ @@ -120,7 +119,6 @@ HEADERS += packagemanagercore.h \ binaryformatengine.cpp \ binaryformatenginehandler.cpp \ repository.cpp \ - zipjob.cpp \ fileutils.cpp \ utils.cpp \ component.cpp \ |