[qlandkartegt] 01/03: Update qt5.patch with upstream changes.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qlandkartegt.

commit 09d2e36c60db3b477e7d347874c48f6ff1cd118c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 3 14:41:28 2015 +0200

    Update qt5.patch with upstream changes.
---
 debian/patches/qt5.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 3d700ae..28b5f2c 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -2,6 +2,11 @@ Description: Update for Qt5
  QString::toAscii() replaced by QString::toLatin1()
  QUrl.setEncodedQueryItems() replaced by QUrl.setQuery(QUrlQuery.setQueryItems())
 Author: Bas Couwenberg <sebastic at debian.org>
+ .
+ Patch was updated to include CMakeLists.txt changes in SVN r4007:
+ http://sourceforge.net/p/qlandkartegt/code/4007/
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: http://sourceforge.net/p/qlandkartegt/mailman/message/34079968/
 
 --- a/src/CDlgEditWpt.cpp
 +++ b/src/CDlgEditWpt.cpp
@@ -53,3 +58,75 @@ Author: Bas Couwenberg <sebastic at debian.org>
  
  CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent)
      : IDeviceTreeWidgetItem(id,parent)
+--- a/3rdparty/cache2gtiff/CMakeLists.txt
++++ b/3rdparty/cache2gtiff/CMakeLists.txt
+@@ -50,9 +50,16 @@ include_directories(
+     ${GDAL_INCLUDE_DIRS}
+     ${PROJ_INCLUDE_DIRS}
+     ${JPEG_INCLUDE_DIRS}
+-    ${QT_QTXML_INCLUDE_DIR}
+     ../../src/
+ )
++
++if (NOT QK_QT5_PORT)
++include_directories(
++  ${QT_QTXML_INCLUDE_DIR}
++)
++endif(NOT QK_QT5_PORT)
++
++
+ if(WIN32)
+     include_directories(
+         ${CMAKE_SOURCE_DIR}/Win32/
+@@ -89,6 +96,7 @@ target_link_libraries( cache2gtiff
+ )
+ 
+ 
++
+ if(QK_QT5_PORT)
+ qt5_use_modules(cache2gtiff  Widgets)
+ qt5_use_modules(cache2gtiff  Xml)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -668,20 +668,13 @@ if(UNIX)
+     add_definitions(-D_TTY_POSIX_ -Wall)
+ endif(UNIX)
+ 
++
+ set(qlandkarte_include_dirs
+   ${CMAKE_BINARY_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+   ${OPENGL_INCLUDE_DIR}
+   ${GDAL_INCLUDE_DIRS}
+   ${PROJ_INCLUDE_DIRS}
+-  ${QT_QTXML_INCLUDE_DIR}
+-  ${QT_QTSQL_INCLUDE_DIR}
+-  ${QT_QTOPENGL_INCLUDE_DIR}
+-  ${QT_QTNETWORK_INCLUDE_DIR}
+-  ${QT_QTDBUS_INCLUDE_DIR}
+-  ${QT_QTWEBKIT_INCLUDE_DIR}
+-  ${QT_QTSCRIPT_INCLUDE_DIR}
+-  ${QT_OPENGL_INCLUDE_DIR}
+   ${CMAKE_SOURCE_DIR}/include
+   ${CMAKE_SOURCE_DIR}/3rdparty/QZip
+   ${CMAKE_SOURCE_DIR}/3rdparty/QTextHtmlExporter
+@@ -694,6 +687,19 @@ set(qlandkarte_include_dirs
+   ${QEXTSERIALPORT_INCLUDE_DIRS}
+ )
+ 
++if (NOT QK_QT5_PORT)
++set(qlandkarte_include_dirs ${qlandkarte_include_dirs}
++  ${QT_QTXML_INCLUDE_DIR}
++  ${QT_QTSQL_INCLUDE_DIR}
++  ${QT_QTOPENGL_INCLUDE_DIR}
++  ${QT_QTNETWORK_INCLUDE_DIR}
++  ${QT_QTDBUS_INCLUDE_DIR}
++  ${QT_QTWEBKIT_INCLUDE_DIR}
++  ${QT_QTSCRIPT_INCLUDE_DIR}
++  ${QT_OPENGL_INCLUDE_DIR}
++)
++endif(NOT QK_QT5_PORT)
++
+ 
+ if(NOT QK_QT5_SERIAL_PORT)
+   set(qlandkarte_include_dirs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qlandkartegt.git