Merge with develop

--HG-- branch : compatibility-develop
9 years ago · 346a0297f6
parent 6cd73cca03 7ff21f975d
commit 346a0297f6
10 changed files with 170 additions and 220 deletions
--- a/code/nel/tools/3d/object_viewer_widget/src/stdpch.h
+++ b/code/nel/tools/3d/object_viewer_widget/src/stdpch.h
@ -29,12 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	#undef free
 #endif

-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QtCore/QtCore>
 #include <QtGui/QtGui>

--- a/code/nel/tools/3d/panoply_preview/main_window.h
+++ b/code/nel/tools/3d/panoply_preview/main_window.h
@ -21,12 +21,6 @@
 // STL includes

 // Qt includes
-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QMainWindow>

 // NeL includes
--- a/code/nel/tools/3d/panoply_preview/panoply_preview.h
+++ b/code/nel/tools/3d/panoply_preview/panoply_preview.h
@ -21,12 +21,6 @@
 // STL includes

 // Qt includes
-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QWidget>
 #include <QTextEdit>
 #include <QLineEdit>
--- a/code/nel/tools/3d/shared_widgets/command_log.h
+++ b/code/nel/tools/3d/shared_widgets/command_log.h
@ -34,12 +34,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // STL includes

 // Qt includes
-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QWidget>
 #include <QTextEdit>
 #include <QLineEdit>
--- a/code/nel/tools/3d/tile_edit_qt/common.h
+++ b/code/nel/tools/3d/tile_edit_qt/common.h
@ -26,12 +26,6 @@
 	#undef free
 #endif

-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QtCore/QtCore>
 #include <QtGui/QtGui>

--- a/code/nel/tools/misc/crash_report/crash_report_data.h
+++ b/code/nel/tools/misc/crash_report/crash_report_data.h
@ -20,12 +20,6 @@
 #ifndef RCERROR_DATA
 #define RCERROR_DATA

-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QString>

 struct SCrashReportData
--- a/code/nel/tools/misc/words_dic_qt/words_dicDlg.h
+++ b/code/nel/tools/misc/words_dic_qt/words_dicDlg.h
@ -1,12 +1,6 @@
 #ifndef WORDS_DICDLG_H
 #define WORDS_DICDLG_H

-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
 #include <QMainWindow>
 #include "ui_words_dic_Qt.h"

--- a/code/ryzom/client/src/http_client_curl.cpp
+++ b/code/ryzom/client/src/http_client_curl.cpp
@ -148,7 +148,7 @@ bool CCurlHttpClient::verifyServer(bool verify)
 	curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, verify ? 1 : 0);
 	curl_easy_setopt(_Curl, CURLOPT_SSLCERTTYPE, "PEM");
 	// would allow to provide the CA in memory instead of using CURLOPT_CAINFO, but needs to include and link OpenSSL
-	if (curl_easy_setopt(_Curl, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function) == CURLE_NOT_BUILT_IN)
+	if (curl_easy_setopt(_Curl, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function) != CURLE_OK)
 	{
 		nlwarning("Unable to support CURLOPT_SSL_CTX_FUNCTION, curl not compiled with OpenSSL ?");
 	}
--- a/code/ryzom/tools/client/client_config_qt/stdpch.h
+++ b/code/ryzom/tools/client/client_config_qt/stdpch.h
@ -17,14 +17,6 @@
 #ifndef STDPCH_H
 #define STDPCH_H

-#include <qglobal.h>
-
-#ifdef Q_COMPILER_RVALUE_REFS
-#undef Q_COMPILER_RVALUE_REFS
-#endif
-
-#include <string>
-
 #include <nel/misc/types_nl.h>
 #include <nel/misc/config_file.h>