Commit e056fadd authored by David Faure's avatar David Faure
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 4db2d47a 94fa78b1
......@@ -201,6 +201,8 @@ if(WIN32 AND MSVC)
add_definitions(-D_AFX_SECURE_NO_WARNINGS)
endif()
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
# Remove pedantic GCC flag which generate a lots of warnings on the console with qCDebug()
while(CMAKE_CXX_FLAGS MATCHES "-pedantic")
string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
......
......@@ -118,7 +118,7 @@ QString O2::requestUrl() {
}
void O2::setRequestUrl(const QString &value) {
requestUrl_ = value;
requestUrl_ = QUrl(value);
Q_EMIT requestUrlChanged();
}
......@@ -138,7 +138,7 @@ QString O2::tokenUrl() {
}
void O2::setTokenUrl(const QString &value) {
tokenUrl_= value;
tokenUrl_= QUrl(value);
Q_EMIT tokenUrlChanged();
}
......@@ -147,7 +147,7 @@ QString O2::refreshTokenUrl() {
}
void O2::setRefreshTokenUrl(const QString &value) {
refreshTokenUrl_ = value;
refreshTokenUrl_ = QUrl(value);
Q_EMIT refreshTokenUrlChanged();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment