[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-7-5-ge885d18

Adam Majer adamm at moszumanska.debian.org
Wed Jan 7 07:16:22 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=4a76f7e

The following commit has been merged in the master branch:
commit 4a76f7e6aaf2e4080d86fc8488e6897722c8cf40
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Dec 25 13:31:11 2014 -0600

    Refreshed patches for upstream release
    
    from_header_to_body.diff removed, since in 3.3.0 release
---
 debian/changelog                                  |  8 +++
 debian/patches/02_use_x-terminal-emulator.diff    |  8 ++-
 debian/patches/always_autotect_qt_versions        | 19 ++++---
 debian/patches/botan_system_lib.diff              | 46 ++++++++++------
 debian/patches/from_header_to_body.diff           | 67 -----------------------
 debian/patches/qt_versions_trough_qtchooser.patch | 48 ++++++++--------
 debian/patches/rpath_nonlinux.diff                | 36 ++++++------
 debian/patches/series                             |  1 -
 8 files changed, 94 insertions(+), 139 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dcf9f2..ef256c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtcreator (3.3.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    + Replace minified jquery instances in upstream tarball with editing
+    friendly version from Debian.
+
+ -- Adam Majer <adamm at zombino.com>  Thu, 25 Dec 2014 01:25:13 -0600
+
 qtcreator (3.2.1+dfsg-7) unstable; urgency=medium
 
   * Adds a missing check for a partially installed Qt version that is
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
index 1c1c647..2f293ba 100644
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ b/debian/patches/02_use_x-terminal-emulator.diff
@@ -5,9 +5,11 @@ Author: Fathi Boudra <fabo at debian.org>
  src/libs/utils/consoleprocess_unix.cpp |    1 +
  1 file changed, 1 insertion(+)
 
---- a/src/libs/utils/consoleprocess_unix.cpp
-+++ b/src/libs/utils/consoleprocess_unix.cpp
-@@ -351,6 +351,7 @@ struct Terminal {
+Index: qtcreator/src/libs/utils/consoleprocess_unix.cpp
+===================================================================
+--- qtcreator.orig/src/libs/utils/consoleprocess_unix.cpp	2014-12-25 01:52:54.142705181 -0600
++++ qtcreator/src/libs/utils/consoleprocess_unix.cpp	2014-12-25 01:52:54.138705181 -0600
+@@ -352,6 +352,7 @@
  
  static const Terminal knownTerminals[] =
  {
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index 71741ab..7c69d18 100644
--- a/debian/patches/always_autotect_qt_versions
+++ b/debian/patches/always_autotect_qt_versions
@@ -1,7 +1,7 @@
 Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 ===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-22 21:36:36.474107687 -0500
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-11-18 10:40:46.775871633 -0600
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 13:18:51.936998208 -0600
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 13:29:00.093021852 -0600
 @@ -139,7 +139,7 @@
  static BaseQtVersion::QmakeBuildConfigs qmakeBuildConfigFromCmdArgs(QList<QMakeAssignment> *assignments,
                                                                      BaseQtVersion::QmakeBuildConfigs defaultBuildConfig);
@@ -30,7 +30,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  
      emit m_instance->qtVersionsLoaded();
      emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-@@ -435,27 +432,55 @@
+@@ -435,28 +432,57 @@
      m_writer->save(data, Core::ICore::mainWindow());
  }
  
@@ -42,9 +42,11 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 -
 -    if (!systemQMakePath.isNull())
 -        systemQMakes << systemQMakePath;
-+    BaseQtVersion *v = QtVersionFactory::createQtVersionFromQMakePath(qmake_fn, true);
-+    if (v)
++    BaseQtVersion *v = QtVersionFactory::createQtVersionFromQMakePath(qmake_fn, true, QLatin1String("PATH"));
++    if (v) {
++        v->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmake_fn, true));
 +        m_versions.insert(v->uniqueId(), v);
++    }
 +}
  
 +static void updateSystemQt()
@@ -55,7 +57,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 -    foreach (const QString &qmakePath, qmakePathsFromQtChooser) {
 -        FileName qmake = FileName::fromString(qmakePath);
 -        systemQMakes << qmake;
-+    if (!systemQMakePath.isEmpty() && !qmakePathsFromQtChooser.contains(systemQMakePath))
++    if (!qmakePathsFromQtChooser.contains(systemQMakePath))
 +        qmakePathsFromQtChooser << systemQMakePath;
 +    qmakePathsFromQtChooser.sort();
 +
@@ -67,9 +69,10 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
      }
  
 -    foreach (const FileName &qmakePath, systemQMakes) {
--        BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qmakePath);
+-        BaseQtVersion *version =
+-                QtVersionFactory::createQtVersionFromQMakePath(qmakePath, true, QLatin1String("PATH"));
 -        if (version) {
--             version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), qmakePath, true));
+-             version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
 -             m_versions.insert(version->uniqueId(), version);
 +    QMap<QString, int>::const_iterator av = currentAutoVersions.begin();
 +    QStringList::const_iterator dv = qmakePathsFromQtChooser.begin();
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index 0cb4dba..2ad6f5d 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -11,8 +11,10 @@ Last-Reviewed: 2014-08-19
  src/libs/ssh/sshkeypasswordretriever_p.h |    1 
  6 files changed, 21 insertions(+), 57 deletions(-)
 
---- a/src/libs/3rdparty/botan/botan.pri
-+++ b/src/libs/3rdparty/botan/botan.pri
+Index: qtcreator/src/libs/3rdparty/botan/botan.pri
+===================================================================
+--- qtcreator.orig/src/libs/3rdparty/botan/botan.pri	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/3rdparty/botan/botan.pri	2014-12-25 11:28:21.388740421 -0600
 @@ -1,57 +1,2 @@
 -INCLUDEPATH *= $$PWD/..
 -HEADERS += $$PWD/botan.h
@@ -73,9 +75,11 @@ Last-Reviewed: 2014-08-19
 -}
 +CONFIG += link_pkgconfig
 +PKGCONFIG += botan-1.10
---- a/src/libs/ssh/sshcryptofacility.cpp
-+++ b/src/libs/ssh/sshcryptofacility.cpp
-@@ -37,6 +37,11 @@
+Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 11:28:21.388740421 -0600
+@@ -38,6 +38,11 @@
  #include "sshpacket_p.h"
  
  #include <botan/botan.h>
@@ -87,9 +91,11 @@ Last-Reviewed: 2014-08-19
  
  #include <QDebug>
  #include <QList>
---- a/src/libs/ssh/sshcryptofacility_p.h
-+++ b/src/libs/ssh/sshcryptofacility_p.h
-@@ -31,9 +31,11 @@
+Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility_p.h	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/ssh/sshcryptofacility_p.h	2014-12-25 11:28:21.388740421 -0600
+@@ -32,9 +32,11 @@
  #define SSHCRYPTOFACILITY_P_H
  
  #include <botan/botan.h>
@@ -101,9 +107,11 @@ Last-Reviewed: 2014-08-19
  
  namespace QSsh {
  namespace Internal {
---- a/src/libs/ssh/sshkeyexchange.cpp
-+++ b/src/libs/ssh/sshkeyexchange.cpp
-@@ -36,6 +36,12 @@
+Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshkeyexchange.cpp	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/ssh/sshkeyexchange.cpp	2014-12-25 11:28:21.388740421 -0600
+@@ -37,6 +37,12 @@
  #include "sshincomingpacket_p.h"
  
  #include <botan/botan.h>
@@ -116,9 +124,11 @@ Last-Reviewed: 2014-08-19
  
  #ifdef CREATOR_SSH_DEBUG
  #include <iostream>
---- a/src/libs/ssh/sshkeygenerator.cpp
-+++ b/src/libs/ssh/sshkeygenerator.cpp
-@@ -35,6 +35,11 @@
+Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshkeygenerator.cpp	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/ssh/sshkeygenerator.cpp	2014-12-25 11:28:21.388740421 -0600
+@@ -36,6 +36,11 @@
  #include "sshpacket_p.h"
  
  #include <botan/botan.h>
@@ -130,9 +140,11 @@ Last-Reviewed: 2014-08-19
  
  #include <QDateTime>
  #include <QInputDialog>
---- a/src/libs/ssh/sshkeypasswordretriever_p.h
-+++ b/src/libs/ssh/sshkeypasswordretriever_p.h
-@@ -30,6 +30,7 @@
+Index: qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshkeypasswordretriever_p.h	2014-12-25 11:28:21.392740421 -0600
++++ qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h	2014-12-25 11:28:21.388740421 -0600
+@@ -31,6 +31,7 @@
  #define KEYPASSWORDRETRIEVER_H
  
  #include <botan/botan.h>
diff --git a/debian/patches/from_header_to_body.diff b/debian/patches/from_header_to_body.diff
index 705353f..e69de29 100644
--- a/debian/patches/from_header_to_body.diff
+++ b/debian/patches/from_header_to_body.diff
@@ -1,67 +0,0 @@
----
- src/plugins/cpptools/cppmodelmanager.cpp |   18 ++++++++++++++++++
- src/plugins/cpptools/cppmodelmanager.h   |   19 +++----------------
- 2 files changed, 21 insertions(+), 16 deletions(-)
-
---- a/src/plugins/cpptools/cppmodelmanager.cpp
-+++ b/src/plugins/cpptools/cppmodelmanager.cpp
-@@ -920,6 +920,24 @@ CppIndexingSupport *CppModelManager::ind
-     return m_indexingSupporter ? m_indexingSupporter : m_internalIndexingSupport;
- }
- 
-+QStringList CppModelManager::projectFiles()
-+{
-+    ensureUpdated();
-+    return m_projectFiles;
-+}
-+
-+ProjectPart::HeaderPaths CppModelManager::headerPaths()
-+{
-+    ensureUpdated();
-+    return m_headerPaths;
-+}
-+
-+QByteArray CppModelManager::definedMacros()
-+{
-+    ensureUpdated();
-+    return m_definedMacros;
-+}
-+
- void CppModelManager::enableGarbageCollector(bool enable)
- {
-     m_delayedGcTimer->stop();
---- a/src/plugins/cpptools/cppmodelmanager.h
-+++ b/src/plugins/cpptools/cppmodelmanager.h
-@@ -122,17 +122,8 @@ public:
-     virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);
-     virtual CppIndexingSupport *indexingSupport();
- 
--    QStringList projectFiles()
--    {
--        ensureUpdated();
--        return m_projectFiles;
--    }
--
--    ProjectPart::HeaderPaths headerPaths()
--    {
--        ensureUpdated();
--        return m_headerPaths;
--    }
-+    QStringList projectFiles();
-+    ProjectPart::HeaderPaths headerPaths();
- 
-     // Use this *only* for auto tests
-     void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths)
-@@ -140,11 +131,7 @@ public:
-         m_headerPaths = headerPaths;
-     }
- 
--    QByteArray definedMacros()
--    {
--        ensureUpdated();
--        return m_definedMacros;
--    }
-+    QByteArray definedMacros();
- 
-     void enableGarbageCollector(bool enable);
- 
diff --git a/debian/patches/qt_versions_trough_qtchooser.patch b/debian/patches/qt_versions_trough_qtchooser.patch
index 98a1ab1..1fc1bb9 100644
--- a/debian/patches/qt_versions_trough_qtchooser.patch
+++ b/debian/patches/qt_versions_trough_qtchooser.patch
@@ -6,10 +6,10 @@ Date:   Thu Oct 16 13:52:28 2014 +0200
    
     Change-Id: I33ae062c3225fb3d7b7d1a62e0e287d326bb4276
  
-Index: qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.cpp
+Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.cpp	2014-10-21 15:00:51.934849796 -0500
++++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp	2014-12-25 01:59:14.818719981 -0600
 @@ -0,0 +1,117 @@
 +/****************************************************************************
 + * *
@@ -128,10 +128,10 @@ Index: qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.cpp
 +}
 +} // namespace Internal
 +} // namespace QtSupport
-Index: qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.h
+Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.h	2014-10-21 15:00:51.938849796 -0500
++++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h	2014-12-25 01:59:14.818719981 -0600
 @@ -0,0 +1,57 @@
 +/****************************************************************************
 + * *
@@ -190,39 +190,39 @@ Index: qtcreator.old/src/plugins/qtsupport/qtchooserqtgatherer.h
 +} // namespace QtSupport
 +
 +#endif // QTCHOOSERQTGATHERER_H
-Index: qtcreator.old/src/plugins/qtsupport/qtsupport.pro
+Index: qtcreator/src/plugins/qtsupport/qtsupport.pro
 ===================================================================
---- qtcreator.old.orig/src/plugins/qtsupport/qtsupport.pro	2014-10-21 15:00:51.938849796 -0500
-+++ qtcreator.old/src/plugins/qtsupport/qtsupport.pro	2014-10-21 15:06:26.318840747 -0500
+--- qtcreator.orig/src/plugins/qtsupport/qtsupport.pro	2014-12-25 01:59:14.822719982 -0600
++++ qtcreator/src/plugins/qtsupport/qtsupport.pro	2014-12-25 11:27:16.928737915 -0600
 @@ -7,6 +7,7 @@
  include(../../shared/proparser/proparser.pri)
  
  HEADERS += \
 +    qtchooserqtgatherer.h \
-     qtsupportplugin.h \
-     qtsupport_global.h \
-     qtkitconfigwidget.h \
-@@ -36,6 +37,7 @@
+     codegenerator.h \
+     codegensettings.h \
+     codegensettingspage.h \
+@@ -39,6 +40,7 @@
      winceqtversion.h
  
  SOURCES += \
 +    qtchooserqtgatherer.cpp \
-     qtsupportplugin.cpp \
-     qtkitconfigwidget.cpp \
-     qtkitinformation.cpp \
-Index: qtcreator.old/src/plugins/qtsupport/qtversionmanager.cpp
+     codegenerator.cpp \
+     codegensettings.cpp \
+     codegensettingspage.cpp \
+Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 ===================================================================
---- qtcreator.old.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-21 15:00:51.938849796 -0500
-+++ qtcreator.old/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-21 15:04:55.582843202 -0500
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 01:59:14.822719982 -0600
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-12-25 11:27:56.452739452 -0600
 @@ -34,6 +34,7 @@
+ #include "qtversionfactory.h"
  #include "baseqtversion.h"
- #include "qtfeatureprovider.h"
  #include "qtsupportconstants.h"
 +#include "qtchooserqtgatherer.h"
  
  #include <coreplugin/icore.h>
  #include <coreplugin/helpmanager.h>
-@@ -436,14 +437,25 @@
+@@ -436,15 +437,26 @@
  
  static void findSystemQt()
  {
@@ -231,9 +231,10 @@ Index: qtcreator.old/src/plugins/qtsupport/qtversionmanager.cpp
 -    if (systemQMakePath.isNull())
 -        return;
  
--    BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(systemQMakePath);
+-    BaseQtVersion *version
+-            = QtVersionFactory::createQtVersionFromQMakePath(systemQMakePath, false, QLatin1String("PATH"));
 -    if (version) {
--        version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), systemQMakePath, true));
+-        version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(systemQMakePath, true));
 -        m_versions.insert(version->uniqueId(), version);
 +    if (!systemQMakePath.isNull())
 +        systemQMakes << systemQMakePath;
@@ -246,9 +247,10 @@ Index: qtcreator.old/src/plugins/qtsupport/qtversionmanager.cpp
 +    }
 +
 +    foreach (const FileName &qmakePath, systemQMakes) {
-+        BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qmakePath);
++        BaseQtVersion *version =
++                QtVersionFactory::createQtVersionFromQMakePath(qmakePath, true, QLatin1String("PATH"));
 +        if (version) {
-+             version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), qmakePath, true));
++             version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
 +             m_versions.insert(version->uniqueId(), version);
 +        }
      }
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 0b5dd6a..320c7d0 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -11,29 +11,23 @@ Forwarded: no
  src/tools/qtcreatorwidgets/qtcreatorwidgets.pro |    4 ++--
  3 files changed, 5 insertions(+), 5 deletions(-)
 
---- a/src/rpath.pri
-+++ b/src/rpath.pri
-@@ -1,7 +1,7 @@
+Index: qtcreator/src/rpath.pri
+===================================================================
+--- qtcreator.orig/src/rpath.pri	2014-12-25 01:53:23.534706324 -0600
++++ qtcreator/src/rpath.pri	2014-12-25 01:54:23.126708641 -0600
+@@ -1,6 +1,6 @@
  macx {
-     QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/
      QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
 -} else:linux-* {
 +} else:linux-*|glibc-*|hurd-* {
      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
      # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
      QMAKE_RPATHDIR += \$\$ORIGIN
---- a/src/qtcreatorplugin.pri
-+++ b/src/qtcreatorplugin.pri
-@@ -126,7 +126,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
- macx {
-     QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/
-     QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
--} else:linux-* {
-+} else:linux-*|glibc-*|hurd-* {
-     #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-     QMAKE_RPATHDIR += \$\$ORIGIN
-     QMAKE_RPATHDIR += \$\$ORIGIN/..
-@@ -139,7 +139,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+Index: qtcreator/src/qtcreatorplugin.pri
+===================================================================
+--- qtcreator.orig/src/qtcreatorplugin.pri	2014-12-25 01:53:23.534706324 -0600
++++ qtcreator/src/qtcreatorplugin.pri	2014-12-25 01:53:23.530706324 -0600
+@@ -96,7 +96,7 @@
  
  TEMPLATE = lib
  CONFIG += plugin plugin_with_soname
@@ -42,9 +36,11 @@ Forwarded: no
  
  !macx {
      target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
---- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
-+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
-@@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {
+Index: qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+===================================================================
+--- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2014-12-25 01:53:23.534706324 -0600
++++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2014-12-25 01:53:23.530706324 -0600
+@@ -13,7 +13,7 @@
      IDE_LIBRARY_BASENAME = lib
  }
  
@@ -53,7 +49,7 @@ Forwarded: no
    # form abs path to qtcreator lib dir
    QTC_LIBS=$$dirname(OUT_PWD)
    QTC_LIBS=$$dirname(QTC_LIBS)
-@@ -21,7 +21,7 @@ linux-*||win32 {
+@@ -21,7 +21,7 @@
    QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
  }
  
diff --git a/debian/patches/series b/debian/patches/series
index adcf9c9..22d6e71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ qt_versions_trough_qtchooser.patch
 
 # Debian patches.
 botan_system_lib.diff
-from_header_to_body.diff
 always_autotect_qt_versions

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list