From afec234f5903f00690f9ed6fa83fac22ec0a8f23 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 1 Apr 2011 18:43:42 +0200 Subject: QLocalSocket/Win: handle ERROR_ACCESS_DENIED When we're getting an ERROR_ACCESS_DENIED we're setting the socket's error to QLocalSocket::SocketAccessError. Task-number: QTBUG-13644 Reviewed-by: ossi --- src/network/socket/qlocalsocket_win.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 7bbe275..468bf8d 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -79,6 +79,11 @@ void QLocalSocketPrivate::setErrorString(const QString &function) errorString = QLocalSocket::tr("%1: Invalid name").arg(function); state = QLocalSocket::UnconnectedState; break; + case ERROR_ACCESS_DENIED: + error = QLocalSocket::SocketAccessError; + errorString = QLocalSocket::tr("%1: Access denied").arg(function); + state = QLocalSocket::UnconnectedState; + break; default: error = QLocalSocket::UnknownSocketError; errorString = QLocalSocket::tr("%1: Unknown error %2").arg(function).arg(windowsError); -- cgit v0.12 From ec41d27565ed0b4d517f30563def135d0b4c7a8d Mon Sep 17 00:00:00 2001 From: Florent Chantret Date: Mon, 4 Apr 2011 17:12:51 +0200 Subject: Fixed deployment problems with MSVC 2005 and 2008 SP1 Notably, DLLs bundled with MSVC Express SP1 releases are only the ones from the SP1, so it is a good idea to force binding to the latest release of the runtime to avoid deployment problems. Keep in mind that it is easier to bundle a private runtime for the software in an setup EXE rather than lauching a runtime setup from the software setup. Task-number: QTBUG-8215 Merge-request: 1171 Reviewed-by: Joerg Bornemann --- mkspecs/win32-msvc2005/qmake.conf | 2 +- mkspecs/win32-msvc2008/qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 5b717e7..a9f725c 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe QT += core gui -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT +DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 QMAKE_CC = cl diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index c765562..fd115e7 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe QT += core gui -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT +DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 QMAKE_CC = cl -- cgit v0.12 From 712e37783210eb8d161b26f090cc240394a1b730 Mon Sep 17 00:00:00 2001 From: Guoqing Zhang Date: Tue, 5 Apr 2011 14:35:19 +0300 Subject: Optimize loc.prf for localization Task-number: Reviewed-by: Miikka Heikkinen --- config.profiles/symbian/loc.prf | 52 ++++++++++++++-------- .../symbian/translations_symbian/translations.pro | 12 +---- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/config.profiles/symbian/loc.prf b/config.profiles/symbian/loc.prf index 9973903..dd0644b 100644 --- a/config.profiles/symbian/loc.prf +++ b/config.profiles/symbian/loc.prf @@ -1,25 +1,41 @@ +CONFIG += localize_deployment qtPrepareTool(LRELEASE, lrelease) -loc.CONFIG = no_link -loc.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -loc.output = $${EPOCROOT}epoc32/data/z/resource/qt/translations/${QMAKE_FILE_BASE}.qm -loc.input = TRANSLATIONS -loc.variable_out = PRE_TARGETDEPS +isEmpty(SYMBIANTRANSLATIONSFILES): SYMBIANTRANSLATIONSFILES = $$symbianRemoveSpecialCharacters($$basename(TARGET)) +isEmpty(SYMBIANTRANSLATIONS):exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/symbian/symbian_i18n.prf) { + load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/symbian/symbian_i18n.prf) +} +isEmpty(SYMBIANTRANSLATIONDIR): SYMBIANTRANSLATIONDIR = $${EPOCROOT}epoc32/data/z/resource/qt/translations +isEmpty(SYMBIANWINSCWUDEBTRANSLATIONDIR): SYMBIANWINSCWUDEBTRANSLATIONDIR = $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/qt/translations +isEmpty(SYMBIANWINSCWURELTRANSLATIONDIR): SYMBIANWINSCWURELTRANSLATIONDIR = $${EPOCROOT}epoc32/release/winscw/urel/z/resource/qt/translations + +for(FILE, SYMBIANTRANSLATIONSFILES) { + for(LANGID, SYMBIANTRANSLATIONS) { + TRANSLATIONS += $${EPOCROOT}epoc32/include/platform/qt/translations/$${FILE}_$${LANGID}.ts + } +} -loc_winscwudeb.CONFIG = no_link -loc_winscwudeb.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -loc_winscwudeb.output = $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/qt/translations/${QMAKE_FILE_BASE}.qm -loc_winscwudeb.input = TRANSLATIONS -loc_winscwudeb.variable_out = PRE_TARGETDEPS +contains(CONFIG, loc_source_string) { + LRELEASE_PARAMS = -qm +} else { + LRELEASE_PARAMS = -idbased -qm +} + +loc.CONFIG = no_link target_predeps +loc.commands = $$LRELEASE ${QMAKE_FILE_IN} $$LRELEASE_PARAMS ${QMAKE_FILE_OUT} +loc.input = TRANSLATIONS +loc.output = $$SYMBIANTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm +loc.variable_out = GENERATED_QM_FILES -loc_winscwurel.CONFIG = no_link -loc_winscwurel.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -loc_winscwurel.output = $${EPOCROOT}epoc32/release/winscw/urel/z/resource/qt/translations/${QMAKE_FILE_BASE}.qm -loc_winscwurel.input = TRANSLATIONS -loc_winscwurel.variable_out = PRE_TARGETDEPS +copy_qm_winscw_udeb.CONFIG = no_link target_predeps +copy_qm_winscw_udeb.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +copy_qm_winscw_udeb.input = GENERATED_QM_FILES +copy_qm_winscw_udeb.output = $$SYMBIANWINSCWUDEBTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm -QMAKE_EXTRA_COMPILERS += loc -QMAKE_EXTRA_COMPILERS += loc_winscwudeb -QMAKE_EXTRA_COMPILERS += loc_winscwurel +copy_qm_winscw_urel.CONFIG = $$copy_qm_winscw_udeb.CONFIG +copy_qm_winscw_urel.commands = $$copy_qm_winscw_udeb.commands +copy_qm_winscw_urel.input = $$copy_qm_winscw_udeb.input +copy_qm_winscw_urel.output = $$SYMBIANWINSCWURELTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm +QMAKE_EXTRA_COMPILERS += loc copy_qm_winscw_udeb copy_qm_winscw_urel diff --git a/config.profiles/symbian/translations_symbian/translations.pro b/config.profiles/symbian/translations_symbian/translations.pro index f304c1b..832af21 100644 --- a/config.profiles/symbian/translations_symbian/translations.pro +++ b/config.profiles/symbian/translations_symbian/translations.pro @@ -1,16 +1,8 @@ TEMPLATE = subdirs - symbian: { SYMBIANTRANSLATIONSFILES = qt SYMBIANTRANSLATIONS = ur fa ar he fr pl ru zh_cn zh_tw cs da de es gl hu ja pt sk sl sv uk - -CONFIG = loc - -for( FILE, SYMBIANTRANSLATIONSFILES ) { - for( LANGID, SYMBIANTRANSLATIONS ) { - TRANSLATIONS += $${EPOCROOT}epoc32/include/platform/qt/translations/$${FILE}_$${LANGID}.ts - } -} - +CONFIG = loc_source_string +load(loc.prf) } \ No newline at end of file -- cgit v0.12