Attachment 8102 Details for Bug 18833 – Patch to make Dianara v1.3.4 build and run with Qt 5

[patch] Patch to make Dianara v1.3.4 build and run with Qt 5

dianara-pro-1.3.4-qt5.patch (text/plain), 1.21 KB, created by JanKusanagi on 2016-07-01 16:19:52 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: JanKusanagi

Created: 2016-07-01 16:19:52 CEST

Size: 1.21 KB

patch

obsolete

>diff --git a/Dianara.pro b/Dianara.pro
>index 1a0706c..517fc29 100644
>--- a/Dianara.pro
>+++ b/Dianara.pro
>@@ -27,12 +27,6 @@ QT       += core gui network
> greaterThan(QT_MAJOR_VERSION, 4) {
>     message("Building with Qt 5: v$$QT_VERSION $$escape_expand(\\n)")
> 
>-    warning(">>> This is currently NOT OFFICIALLY SUPPORTED.")
>-    warning(">>> Building should succeed, but the generated binary will")
>-    warning(">>> probably crash on startup, unless you have qoauth-qt5")
>-    warning(">>>")
>-    warning(">>> To build with Qt 4, you probably need to use qmake-qt4 instead\
>-$$escape_expand(\\n)")
>     QT += widgets
> }
> 
>@@ -187,9 +181,9 @@ TRANSLATIONS += translations/dianara_es.ts \
> 
> RESOURCES += dianara.qrc
> 
>-LIBS += -lqoauth -lmagic # to use libmagic (and QOauth in Debian)
>+LIBS += -lmagic # to use libmagic
> 
>-CONFIG += oauth crypto # To use QOAuth (Debian also needs 'crypto')
>+CONFIG += oauth # To use QOAuth
> 
> win32 { # Console support under mswin
>     CONFIG += console
>@@ -201,9 +195,6 @@ target.path = /usr/bin/
> INSTALLS += target
> 
> 
>-## TMP/FIXME added for Debian (Debian's libqoauth-dev bug)
>-INCLUDEPATH += /usr/include/QtOAuth
>-
> 
> message("$$escape_expand(\\n\\n\\n)\
> Makefile done!$$escape_expand(\\n\\n)\

diff --git a/Dianara.pro b/Dianara.pro
index 1a0706c..517fc29 100644
--- a/Dianara.pro
+++ b/Dianara.pro
@@ -27,12 +27,6 @@ QT       += core gui network
 greaterThan(QT_MAJOR_VERSION, 4) {
     message("Building with Qt 5: v$$QT_VERSION $$escape_expand(\\n)")
 
-    warning(">>> This is currently NOT OFFICIALLY SUPPORTED.")
-    warning(">>> Building should succeed, but the generated binary will")
-    warning(">>> probably crash on startup, unless you have qoauth-qt5")
-    warning(">>>")
-    warning(">>> To build with Qt 4, you probably need to use qmake-qt4 instead\
-$$escape_expand(\\n)")
     QT += widgets
 }
 
@@ -187,9 +181,9 @@ TRANSLATIONS += translations/dianara_es.ts \
 
 RESOURCES += dianara.qrc
 
-LIBS += -lqoauth -lmagic # to use libmagic (and QOauth in Debian)
+LIBS += -lmagic # to use libmagic
 
-CONFIG += oauth crypto # To use QOAuth (Debian also needs 'crypto')
+CONFIG += oauth # To use QOAuth
 
 win32 { # Console support under mswin
     CONFIG += console
@@ -201,9 +195,6 @@ target.path = /usr/bin/
 INSTALLS += target
 
 
-## TMP/FIXME added for Debian (Debian's libqoauth-dev bug)
-INCLUDEPATH += /usr/include/QtOAuth
-
 
 message("$$escape_expand(\\n\\n\\n)\
 Makefile done!$$escape_expand(\\n\\n)\

Actions: View | Diff

Attachments on bug 18833: 8102 | 8103