Mercurial > trustbridge
comparison ui/aboutdialog.cpp @ 1239:5839d864239c
Merged.
author | Emanuel Schuetze <emanuel@intevation.de> |
---|---|
date | Wed, 24 Sep 2014 15:52:32 +0200 |
parents | 6154d554b3af |
children | f1f4059ec320 |
comparison
equal
deleted
inserted
replaced
1238:4a329513ee86 | 1239:5839d864239c |
---|---|
59 "<li>PolarSSL (GNU GPL v>=2)" + | 59 "<li>PolarSSL (GNU GPL v>=2)" + |
60 "<li>Oxygen-Icons (GNU LGPL v>=3)" + | 60 "<li>Oxygen-Icons (GNU LGPL v>=3)" + |
61 "<li>OpenSSL-based signcode utility (GNU GPL v==3)" + | 61 "<li>OpenSSL-based signcode utility (GNU GPL v==3)" + |
62 "<li>OpenSSL (OpenSSL License)" + | 62 "<li>OpenSSL (OpenSSL License)" + |
63 "<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" + | 63 "<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" + |
64 tr("You will find the legally binding details in the 'licenses' directory of the " | 64 tr("You will find the legally binding details in the 'licenses' directory " |
65 "where TrustBridge is installed " | |
66 "or in the corresponding revision of the" | |
65 "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); | 67 "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); |
66 | 68 |
67 textDesc->setTextFormat(Qt::RichText); | 69 textDesc->setTextFormat(Qt::RichText); |
68 textDesc->setTextInteractionFlags( | 70 textDesc->setTextInteractionFlags( |
69 Qt::TextSelectableByMouse | | 71 Qt::TextSelectableByMouse | |