# # # patch "guitone/guitone.pro" # from [222143e6cb858ecebff9b72dab79d01c0fb372fb] # to [371575ba78c96c952026abdef6b4309ee334240a] # # patch "guitone/src/util/Platform.cpp" # from [9777c5d001afd2de304f58b7caf3740d35f084da] # to [18fcb3ef0533eea227a1997a1761dd53ef52ff91] # ============================================================ --- guitone/guitone.pro 222143e6cb858ecebff9b72dab79d01c0fb372fb +++ guitone/guitone.pro 371575ba78c96c952026abdef6b4309ee334240a @@ -122,7 +122,7 @@ PRECOMPILED_HEADER = src/stable.h RCC_DIR = tmp PRECOMPILED_HEADER = src/stable.h -win32:LIBS += shell32.lib +win32:LIBS += shell32.lib Advapi32.lib macx | unix { QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter ============================================================ --- guitone/src/util/Platform.cpp 9777c5d001afd2de304f58b7caf3740d35f084da +++ guitone/src/util/Platform.cpp 18fcb3ef0533eea227a1997a1761dd53ef52ff91 @@ -116,19 +116,19 @@ QString Platform::getUsername() #ifdef Q_WS_WIN #if defined(UNICODE) - if ( qWinVersion() & Qt::WV_NT_based ) + if ( QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) { TCHAR winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H DWORD winUserNameSize = sizeof(winUserName); - GetUserName( winUserName, &winUserNameSize ); - userName = qt_winQString( winUserName ); + GetUserNameW( winUserName, &winUserNameSize ); + username = QString::fromStdWString( winUserName ); } else #endif { char winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H DWORD winUserNameSize = sizeof(winUserName); GetUserNameA( winUserName, &winUserNameSize ); - userName = QString::fromLocal8Bit( winUserName ); + username = QString::fromLocal8Bit( winUserName ); } #endif