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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Conflicts:
	src/plugins/android/androiddeployqtstep.cpp

Change-Id: Id624bad384050d567efba0700046331086cb12dd
This commit is contained in:
Eike Ziller
2020-08-13 13:28:33 +02:00
parent 94f6113990 54b1aaed03
commit 0c4135e380
98 changed files with 3843 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/sqlite/sqlite-lib.pri
View File

@@ -67,3 +67,5 @@ CONFIG(debug, debug|release): DEFINES += SQLITE_ENABLE_API_ARMOR
OTHER_FILES += README.md
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += exceptions