GUI: Qt5 fixes
This commit is contained in:
parent
3753a1d340
commit
947cba39d1
|
|
@ -692,9 +692,9 @@ void MainWindow::openShortcuts()
|
|||
void MainWindow::changeTopmost(bool checked)
|
||||
{
|
||||
if(checked)
|
||||
SetWindowPos(this->winId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
|
||||
SetWindowPos((HWND)this->winId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
|
||||
else
|
||||
SetWindowPos(this->winId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
|
||||
SetWindowPos((HWND)this->winId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
|
||||
}
|
||||
|
||||
void MainWindow::addRecentFile(QString file)
|
||||
|
|
|
|||
|
|
@ -66,8 +66,10 @@ int main(int argc, char* argv[])
|
|||
|
||||
// Set QString codec to UTF-8
|
||||
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
|
||||
QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
|
||||
#endif
|
||||
|
||||
// Init communication with debugger
|
||||
Bridge::initBridge();
|
||||
|
|
|
|||
Loading…
Reference in New Issue