# HG changeset patch # User unc0rr # Date 1377609727 -14400 # Node ID 0f5961910e2712582b162abd08ae3eed330cc978 # Parent a501f5ec7b34e1eeac02208351db21c38a64c28a# Parent 7a97a554ac806c10e5a832fb17a7eb8f0f5bca7c Merge diff -r 7a97a554ac80 -r 0f5961910e27 CMakeLists.txt --- a/CMakeLists.txt Tue Aug 27 14:12:16 2013 +0200 +++ b/CMakeLists.txt Tue Aug 27 17:22:07 2013 +0400 @@ -72,13 +72,13 @@ include(${CMAKE_MODULE_PATH}/compilerchecks.cmake) #set default compiler flags -add_flag_append(CMAKE_C_FLAGS "-Wall -pipe") +add_flag_append(CMAKE_C_FLAGS "-Wall -pipe -fPIC") add_flag_append(CMAKE_C_FLAGS_RELEASE "-Os") add_flag_append(CMAKE_C_FLAGS_DEBUG "-Wextra -O0") -add_flag_append(CMAKE_CXX_FLAGS "-Wall -pipe") +add_flag_append(CMAKE_CXX_FLAGS "-Wall -pipe -fPIC") add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-Os") add_flag_append(CMAKE_CXX_FLAGS_DEBUG "-Wextra -O0") -add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000") +add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000 -fPIC") add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-O- -gv") add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Os -Xs") diff -r 7a97a554ac80 -r 0f5961910e27 QTfrontend/ui/dialog/upload_video.cpp --- a/QTfrontend/ui/dialog/upload_video.cpp Tue Aug 27 14:12:16 2013 +0200 +++ b/QTfrontend/ui/dialog/upload_video.cpp Tue Aug 27 17:22:07 2013 +0400 @@ -291,7 +291,7 @@ QNetworkReply *reply = (QNetworkReply*)sender(); reply->deleteLater(); - location = QString::fromAscii(reply->rawHeader("Location")); + location = QString::fromLatin1(reply->rawHeader("Location")); if (location.isEmpty()) { QString errorStr = QMessageBox::tr("Error while sending metadata to youtube.com:\n"); diff -r 7a97a554ac80 -r 0f5961910e27 QTfrontend/ui/page/pagevideos.cpp --- a/QTfrontend/ui/page/pagevideos.cpp Tue Aug 27 14:12:16 2013 +0200 +++ b/QTfrontend/ui/page/pagevideos.cpp Tue Aug 27 17:22:07 2013 +0400 @@ -845,7 +845,7 @@ for (int i = 0; i < array.size(); i++) array[i] = array[i] ^ 0xC4 ^ i; array = array.toBase64(); - return QString::fromAscii(array.data()); + return QString::fromLatin1(array.data()); } static QString unprotectPass(QString str)