-
Notifications
You must be signed in to change notification settings - Fork 35.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit squashes all the changes in the Qt5 branch relative to master. Backward compatibility with Qt4 is retained. Original authors: - Philip Kaufmann <phil.kaufmann@t-online.de> - Jonas Schnelli <jonas.schnelli@include7.ch>
- Loading branch information
Showing
17 changed files
with
90 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,8 +13,12 @@ | |
#include <QDoubleValidator> | ||
#include <QFont> | ||
#include <QLineEdit> | ||
#if QT_VERSION >= 0x050000 | ||
This comment has been minimized.
Sorry, something went wrong.
Gitju
|
||
#include <QUrlQuery> | ||
#else | ||
#include <QUrl> | ||
#include <QTextDocument> // For Qt::escape | ||
#endif | ||
#include <QTextDocument> // for Qt::mightBeRichText | ||
#include <QAbstractItemView> | ||
#include <QClipboard> | ||
#include <QFileDialog> | ||
|
@@ -86,7 +90,13 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) | |
SendCoinsRecipient rv; | ||
rv.address = uri.path(); | ||
rv.amount = 0; | ||
|
||
#if QT_VERSION < 0x050000 | ||
QList<QPair<QString, QString> > items = uri.queryItems(); | ||
#else | ||
QUrlQuery uriQuery(uri); | ||
QList<QPair<QString, QString> > items = uriQuery.queryItems(); | ||
#endif | ||
for (QList<QPair<QString, QString> >::iterator i = items.begin(); i != items.end(); i++) | ||
{ | ||
bool fShouldReturnFalse = false; | ||
|
@@ -139,7 +149,11 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) | |
|
||
QString HtmlEscape(const QString& str, bool fMultiLine) | ||
{ | ||
#if QT_VERSION < 0x050000 | ||
QString escaped = Qt::escape(str); | ||
#else | ||
QString escaped = str.toHtmlEscaped(); | ||
#endif | ||
if(fMultiLine) | ||
{ | ||
escaped = escaped.replace("\n", "<br>\n"); | ||
|
@@ -176,7 +190,11 @@ QString getSaveFileName(QWidget *parent, const QString &caption, | |
QString myDir; | ||
if(dir.isEmpty()) // Default to user documents location | ||
{ | ||
#if QT_VERSION < 0x050000 | ||
myDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); | ||
#else | ||
myDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); | ||
#endif | ||
} | ||
else | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AFAIK this is not needed here and seems to have sneaked back in by the Qt5 pull?
It's below in macx:HEADERS in my local build?
@jonasschnelli Can you take a look?