feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	src/libs/sqlite/sqlitebasestatement.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
This commit is contained in:
Tim Jenssen
2021-05-06 13:06:28 +02:00
parent 201786d3fc fb26650d86
commit 888ca0dd20
42 changed files with 415 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/sqlite/sqlitebasestatement.cpp
View File

@@ -29,7 +29,7 @@
#include "sqlitedatabasebackend.h"
#include "sqliteexception.h"
#include "sqlite3.h"
#include "sqlite.h"
#include <condition_variable>
#include <mutex>