# HG changeset patch # User Andre Heinecke # Date 1403018712 -7200 # Node ID 854248d81ba41dc0031818c321786fb3befcb87b # Parent 9cdc14373a5d27d0bb8267c19e29db5b4a3390b2 Fully switch to unicode for windows. This will be needed sooner or later and it makes sense to have it unified now. diff -r 9cdc14373a5d -r 854248d81ba4 ui/CMakeLists.txt --- a/ui/CMakeLists.txt Mon Jun 16 14:58:02 2014 +0200 +++ b/ui/CMakeLists.txt Tue Jun 17 17:25:12 2014 +0200 @@ -94,6 +94,8 @@ -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16) set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp -lcrypt32) + + add_definitions(-DUNICODE) endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") diff -r 9cdc14373a5d -r 854248d81ba4 ui/tests/windowsstoretest.cpp --- a/ui/tests/windowsstoretest.cpp Mon Jun 16 14:58:02 2014 +0200 +++ b/ui/tests/windowsstoretest.cpp Tue Jun 17 17:25:12 2014 +0200 @@ -14,7 +14,7 @@ #include void WindowsStoreTest::dumpContents() { - char pszNameString[256]; + wchar_t pszNameString[256]; PCCERT_CONTEXT pCert = NULL; qDebug() << "Currently in store: " ; while((pCert = CertEnumCertificatesInStore(testStore, pCert))) {