diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui
index 8f8e8f29d..b2f711b72 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.ui
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui
@@ -73,7 +73,7 @@
- 12
+ 12
75
true
@@ -191,11 +191,6 @@
-
-
-
- 11
-
-
16
@@ -464,7 +459,7 @@
LineEditClear
QLineEdit
- gui/common/LineEditClear.h
+ gui/common/LineEditClear.h
RSTreeWidget
diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui
index a8e8217fc..02408e382 100644
--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@@ -102,7 +102,7 @@
Qt::NoFocus
-
+
:/icons/help_64.png:/icons/help_64.png
@@ -132,10 +132,10 @@
- QFrame::StyledPanel
+ QFrame::Box
- QFrame::Raised
+ QFrame::Sunken
@@ -401,8 +401,8 @@
-
+
diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui
index 5de0fa6fe..e716577b8 100644
--- a/retroshare-gui/src/gui/HomePage.ui
+++ b/retroshare-gui/src/gui/HomePage.ui
@@ -43,7 +43,6 @@
Courier New
- 10
75
true
@@ -88,7 +87,6 @@
- 11
75
true
@@ -107,7 +105,7 @@
...
-
+
:/icons/help_64.png:/icons/help_64.png
@@ -233,11 +231,6 @@
-
-
-
- 12
-
-
Open Source cross-platform,
private and secure decentralized communication platform.
@@ -317,11 +310,6 @@ private and secure decentralized communication platform.
-
-
-
- 11
-
-
@@ -405,11 +393,6 @@ private and secure decentralized communication platform.
-
-
-
- 11
-
-
Do you need help with Retroshare?
@@ -424,8 +407,8 @@ private and secure decentralized communication platform.
-
+
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index ee28522e3..69d1cd8fd 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -91,7 +91,7 @@
- 12
+ 12
75
true
@@ -218,11 +218,6 @@
0
-
-
- 11
-
-
Qt::CustomContextMenu
@@ -301,8 +296,8 @@
0
0
- 505
- 703
+ 513
+ 764
@@ -1018,11 +1013,6 @@ border-image: url(:/images/closepressed.png)
-
-
-
- 11
-
-
Qt::CustomContextMenu
@@ -1083,7 +1073,12 @@ border-image: url(:/images/closepressed.png)
LineEditClear
QLineEdit
- gui/common/LineEditClear.h
+ gui/common/LineEditClear.h
+
+
+ RSComboBox
+ QComboBox
+
RSTreeWidget
@@ -1094,11 +1089,7 @@ border-image: url(:/images/closepressed.png)
ElidedLabel
QLabel
-
-
- RSComboBox
- QComboBox
-
+ 1
RSTextBrowser
diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui
index 55a7145e0..796593dfd 100644
--- a/retroshare-gui/src/gui/MainWindow.ui
+++ b/retroshare-gui/src/gui/MainWindow.ui
@@ -33,11 +33,6 @@
0
-
-
- 12
-
-
QFrame::NoFrame
@@ -157,7 +152,7 @@
-
+
:/images/kcmsystem24.png:/images/kcmsystem24.png
diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui
index 32a679a74..ff8c17f5e 100644
--- a/retroshare-gui/src/gui/NewsFeed.ui
+++ b/retroshare-gui/src/gui/NewsFeed.ui
@@ -70,8 +70,8 @@
- 12
- 75
+ 12
+ 75
true
diff --git a/retroshare-gui/src/gui/Posted/PhotoView.ui b/retroshare-gui/src/gui/Posted/PhotoView.ui
index e1e7a21e5..31db767c9 100644
--- a/retroshare-gui/src/gui/Posted/PhotoView.ui
+++ b/retroshare-gui/src/gui/Posted/PhotoView.ui
@@ -22,7 +22,6 @@
MS Sans Serif
- 11
75
true
true
@@ -103,7 +102,6 @@
MS Sans Serif
- 9
50
false
@@ -114,7 +112,7 @@
-
-
+
24
@@ -134,7 +132,6 @@
MS Sans Serif
- 11
75
true
true
@@ -150,7 +147,6 @@
MS Sans Serif
- 9
@@ -163,7 +159,6 @@
MS Sans Serif
- 9
@@ -209,17 +204,17 @@
+
+ AvatarWidget
+ QLabel
+ gui/common/AvatarWidget.h
+ 1
+
GxsIdLabel
QLabel
-
- AvatarWidget
- QWidget
- gui/common/AvatarWidget.h
- 1
-
AspectRatioPixmapLabel
QLabel
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index 24d570b16..cbf5ae7f4 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -262,7 +262,6 @@
- 11
75
true
true
@@ -726,17 +725,17 @@
-
- GxsIdLabel
- QLabel
-
-
ElidedLabel
QLabel
1
+
+ GxsIdLabel
+ QLabel
+
+
ZoomableLabel
QLabel
@@ -744,9 +743,9 @@
-
-
+
+
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index 8074388dc..734c4a233 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -54,7 +54,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html>
@@ -355,10 +355,10 @@ p, li { white-space: pre-wrap; }
-
- QFrame::Box
+ QFrame::StyledPanel
- QFrame::Sunken
+ QFrame::Raised
@@ -576,37 +576,10 @@ p, li { white-space: pre-wrap; }
-
- ElidedLabel
- QLabel
-
- 1
-
-
- GxsIdChooser
- QComboBox
-
-
-
- GxsIdLabel
- QLabel
-
-
LineEditClear
QLineEdit
- gui/common/LineEditClear.h
-
-
- RSComboBox
- QComboBox
-
-
-
- RSTabWidget
- QTabWidget
-
- 1
+ gui/common/LineEditClear.h
RSTreeView
@@ -614,15 +587,42 @@ p, li { white-space: pre-wrap; }
1
+
+ GxsIdLabel
+ QLabel
+
+
+
+ ElidedLabel
+ QLabel
+
+ 1
+
SubscribeToolButton
QToolButton
gui/common/SubscribeToolButton.h
+
+ RSComboBox
+ QComboBox
+
+
+
+ GxsIdChooser
+ QComboBox
+
+
+
+ RSTabWidget
+ QTabWidget
+
+ 1
+
-
+
diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui
index 8c491caeb..dd037adf4 100644
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@@ -345,8 +345,8 @@ The current identities/locations will not be affected.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">New Profile/Node</span></a></p></body></html>
+</style></head><body style=" font-family:'Sans'; font-size:13pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#0000ff;">New Profile/Node</span></a></p></body></html>
@@ -370,8 +370,8 @@ p, li { white-space: pre-wrap; }
-
+
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
index 065c9013b..a9bc8b407 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
@@ -38,11 +38,6 @@
0
-
-
- 11
-
-
Qt::CustomContextMenu
@@ -71,7 +66,7 @@
LineEditClear
QLineEdit
- gui/common/LineEditClear.h
+ gui/common/LineEditClear.h
RSTreeWidget
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
index 029d71fb9..10b5eb48b 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
@@ -70,11 +70,6 @@
0
-
-
- 11
-
-
Qt::CustomContextMenu
diff --git a/retroshare-gui/src/gui/common/NewFriendList.ui b/retroshare-gui/src/gui/common/NewFriendList.ui
index 4bd4dfdc6..286cf4304 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.ui
+++ b/retroshare-gui/src/gui/common/NewFriendList.ui
@@ -58,11 +58,6 @@
-
-
-
- 12
-
-
Qt::CustomContextMenu
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index 6bd0fb86b..2740b4654 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -29,10 +29,10 @@
-
- QFrame::Box
+ QFrame::StyledPanel
- QFrame::Sunken
+ QFrame::Raised
@@ -402,7 +402,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html>
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 5a9c51e93..439234047 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -48,10 +48,10 @@
- QFrame::Box
+ QFrame::StyledPanel
- QFrame::Sunken
+ QFrame::Raised
@@ -578,10 +578,9 @@
- ElidedLabel
- QLabel
-
- 1
+ LineEditClear
+ QLineEdit
+ gui/common/LineEditClear.h
GxsIdLabel
@@ -589,9 +588,15 @@
- LineEditClear
- QLineEdit
- gui/common/LineEditClear.h
+ ElidedLabel
+ QLabel
+
+ 1
+
+
+ SubscribeToolButton
+ QToolButton
+ gui/common/SubscribeToolButton.h
RSImageBlockWidget
@@ -609,11 +614,6 @@
QComboBox
-
- SubscribeToolButton
- QToolButton
- gui/common/SubscribeToolButton.h
-
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui
index de580d7e5..cd4a7c401 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui
@@ -6,7 +6,7 @@
0
0
- 698
+ 738
539
@@ -59,11 +59,6 @@
0
-
-
- 9
-
-
Qt::LeftToRight
@@ -211,11 +206,6 @@
0
-
-
- 9
-
-
Tags:
@@ -232,11 +222,6 @@
0
-
-
- 9
-
-
Subject:
@@ -253,11 +238,6 @@
0
-
-
- 9
-
-
Cc:
@@ -277,11 +257,6 @@
0
-
-
- 9
-
-
Bcc:
@@ -298,11 +273,6 @@
0
-
-
- 9
-
-
To:
@@ -321,7 +291,6 @@
- 9
75
true
@@ -373,11 +342,6 @@
16777215
-
-
- 9
-
-
true
@@ -416,11 +380,6 @@
0
-
-
- 9
-
-
From:
@@ -860,8 +819,8 @@
-
+
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
index 5f1d83eca..516511265 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
@@ -139,11 +139,6 @@
0
-
-
- 11
-
-
Qt::CustomContextMenu
@@ -253,11 +248,6 @@
0
-
-
- 11
-
-
@@ -375,11 +365,6 @@
Qt::Vertical
-
-
- 10
-
-
Qt::CustomContextMenu
@@ -466,7 +451,7 @@
LineEditClear
QLineEdit
- gui/common/LineEditClear.h
+ gui/common/LineEditClear.h
RSTabWidget
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 6a0feaf2b..5b3b49908 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -52,7 +52,7 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ;
QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ;
QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ;
- QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
+ //QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
QObject::connect(ui._diskSpaceLimit_SB,SIGNAL(valueChanged(int)),this,SLOT(updateDiskSizeLimit(int))) ;
QObject::connect(ui._max_tr_up_per_sec_SB, SIGNAL( valueChanged( int ) ), this, SLOT( updateMaxTRUpRate(int) ) );
QObject::connect(ui._filePermDirectDL_CB,SIGNAL(activated(int)),this,SLOT(updateFilePermDirectDL(int)));
@@ -112,6 +112,7 @@ void TransferPage::updateMaxUploadSlots(int b)
rsFiles->setMaxUploadSlotsPerFriend(b) ;
}
+#ifdef TO_REMOVE
void TransferPage::updateEncryptionPolicy(int b)
{
switch(b)
@@ -123,6 +124,7 @@ void TransferPage::updateEncryptionPolicy(int b)
break ;
}
}
+#endif
void TransferPage::updateFilePermDirectDL(int i)
{
@@ -160,11 +162,13 @@ void TransferPage::load()
case FileChunksInfo::CHUNK_STRATEGY_RANDOM: whileBlocking(ui._defaultStrategy_CB)->setCurrentIndex(2) ; break ;
}
+#ifdef TO_REMOVE
switch(rsFiles->defaultEncryptionPolicy())
{
case RS_FILE_CTRL_ENCRYPTION_POLICY_PERMISSIVE: whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(0) ; break ;
case RS_FILE_CTRL_ENCRYPTION_POLICY_STRICT : whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(1) ; break ;
}
+#endif
whileBlocking(ui._diskSpaceLimit_SB)->setValue(rsFiles->freeDiskSpaceLimit()) ;
whileBlocking(ui._max_tr_up_per_sec_SB)->setValue(rsTurtle->getMaxTRForwardRate()) ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h
index a2a0a1061..077d5a6ec 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.h
+++ b/retroshare-gui/src/gui/settings/TransferPage.h
@@ -47,7 +47,6 @@ class TransferPage: public ConfigPage
void updateDefaultStrategy(int) ;
void updateDiskSizeLimit(int) ;
void updateMaxTRUpRate(int);
- void updateEncryptionPolicy(int);
void updateMaxUploadSlots(int);
void updateFilePermDirectDL(int);
void updateIgnoreLists();
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index b6d8cd7ff..e77ee1742 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -400,13 +400,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- End-to-end encryption:
-
-
-
-
@@ -503,23 +496,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- <html><head/><body><p>Anonymous tunnels can be end-o-end encrypted. In order to maintain backward compatibility, this can be made optional (choosing "Accepted"), but in the end, all Retroshare nodes will be switched to "Enforced", meaning that all anonymous transfers will be end-to-end encrypted. With "Accepted", it is likely that you will transfer using twice as many tunnels, since there is no way to know that an encrypted and a clear tunnel actually transfer from the same source.</p></body></html>
-
-
-
-
- Accepted
-
-
- -
-
- Enforced
-
-
-
-
-
diff --git a/retroshare-gui/src/gui/settings/settingsw.ui b/retroshare-gui/src/gui/settings/settingsw.ui
index d1cbd3caf..605e8558e 100644
--- a/retroshare-gui/src/gui/settings/settingsw.ui
+++ b/retroshare-gui/src/gui/settings/settingsw.ui
@@ -35,11 +35,6 @@
16777215
-
-
- 11
-
-
Qt::IgnoreAction
@@ -100,7 +95,6 @@
- 12
75
true
@@ -135,8 +129,8 @@
0
0
- 1313
- 849
+ 1264
+ 845
diff --git a/retroshare-gui/src/util/RichTextEdit.ui b/retroshare-gui/src/util/RichTextEdit.ui
index 63e624b5e..5bb57a792 100644
--- a/retroshare-gui/src/util/RichTextEdit.ui
+++ b/retroshare-gui/src/util/RichTextEdit.ui
@@ -6,7 +6,7 @@
0
0
- 703
+ 784
312
@@ -566,7 +566,6 @@
MS Sans Serif
- 9
@@ -590,16 +589,16 @@
-
- MimeTextEdit
- QTextEdit
- gui/common/MimeTextEdit.h
-
RSComboBox
QComboBox
+
+ MimeTextEdit
+ QTextEdit
+ gui/common/MimeTextEdit.h
+
f_textedit
@@ -608,7 +607,6 @@
f_menu
-
diff --git a/retroshare.pri b/retroshare.pri
index 22bf11d3f..2e8bb729a 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -132,7 +132,7 @@ use_dht_stunner_ext_ip:CONFIG -= no_use_dht_stunner_ext_ip
# To select your MacOsX version append the following assignation to qmake
# command line "CONFIG+=rs_macos10.11" where 10.11 depends your version
-macx:CONFIG *= rs_macos10.11
+macx:CONFIG *= rs_macos11.1
rs_macos10.8:CONFIG -= rs_macos10.11
rs_macos10.9:CONFIG -= rs_macos10.11
rs_macos10.10:CONFIG -= rs_macos10.11
@@ -286,7 +286,7 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread
#
# V07_NON_BACKWARD_COMPATIBLE_CHANGE_002:
#
-# What: Use RSA+SHA256 instead of RSA+SHA1 for PGP certificate signatures
+# What: Use RSA+SHA256 instead of RSA+SHA1 for SSL certificates
#
# Why: Sha1 is likely to be prone to primary collisions anytime soon, so it is urgent to turn to a more secure solution.
#
@@ -296,16 +296,26 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread
#
# What: Do not hash PGP certificate twice when signing
#
-# Why: hasing twice is not per se a security issue, but it makes it harder to change the settings for hashing.
+# Why: hasing twice is not per se a security issue, but it makes it harder to change the settings for hashing.
#
-# Backward compat: patched peers cannot connect to non patched peers older than Nov 2017.
+# Backward compat: patched peers cannot connect to non patched peers older than Nov 2017.
#
# V07_NON_BACKWARD_COMPATIBLE_CHANGE_004:
#
# What: Do not probe that GXS tunnels accept fast items. Just assume they do.
+#
# Why: Avoids sending probe packets
+#
# BackwardCompat: old RS before Mai 2019 will not be able to distant chat.
#
+# V07_NON_BACKWARD_COMPATIBLE_CHANGE_005:
+#
+# What: Stop accepting certificates signed with sha1 algorithm
+#
+# Why: Sha1 has been declared insecure and shouldn't be used anymore.
+#
+# BackwardCompat: Retroshare profiles generated before Nov.2024 with openpgp-sdk may still use sha1
+#
###########################################################################################################################################################
###########################################################################################################################################################
@@ -842,6 +852,9 @@ macx-* {
QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
+ INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
+ INCLUDEPATH += "/usr/local/opt/libxslt/include"
+ QMAKE_LIBDIR += "/usr/local/opt/libxslt/lib"
}
# If not yet defined attempt UPnP library autodetection should works at least