diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f5a246e7..c73dfa4f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") add_definitions(-DFALKON_VERSION=\"${PROJECT_VERSION}\") # Defines that are always set -add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII) # Configurable options (TODO: move all defines to a generated header) option(NO_SYSTEM_DATAPATH "TODO" OFF) @@ -132,7 +132,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/lib/plugins ${CMAKE_SOURCE_DIR}/src/lib/popupwindow ${CMAKE_SOURCE_DIR}/src/lib/preferences - ${CMAKE_SOURCE_DIR}/src/lib/rss ${CMAKE_SOURCE_DIR}/src/lib/session ${CMAKE_SOURCE_DIR}/src/lib/sidebar ${CMAKE_SOURCE_DIR}/src/lib/tabwidget diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index 94b86e2ff..91766f6c4 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -136,7 +136,7 @@ LoadRequest SearchEnginesManager::searchResult(const Engine &engine, const QStri // GET search engine if (engine.postData.isEmpty()) { QByteArray url = engine.url.toUtf8(); - url.replace(QLatin1String("%s"), QUrl::toPercentEncoding(string)); + url.replace("%s", QUrl::toPercentEncoding(string)); return LoadRequest(QUrl::fromEncoded(url)); } diff --git a/src/lib/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp index da6986517..de11316d0 100644 --- a/src/lib/preferences/acceptlanguage.cpp +++ b/src/lib/preferences/acceptlanguage.cpp @@ -60,7 +60,7 @@ QByteArray AcceptLanguage::generateHeader(const QStringList &langs) } QByteArray header; - header.append(langs.at(0)); + header.append(langs.at(0).toLatin1()); int counter = 8; for (int i = 1; i < langs.count(); i++) { @@ -70,7 +70,7 @@ QByteArray AcceptLanguage::generateHeader(const QStringList &langs) counter -= 2; } - header.append(s); + header.append(s.toLatin1()); } return header;