Skip to content

Commit d72c2a8

Browse files
devbeandevbean
committed
Merge branch 'release/1.0'
2 parents 9f50501 + 23b841b commit d72c2a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+40967
-12482
lines changed

‎.qmake.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
top_srcdir=$$PWD
2+
top_builddir=$$shadowed($$PWD)

‎QtCipherSqlitePlugin.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
TEMPLATE = subdirs
2+
SUBDIRS += sqlitecipher test testapp

‎sqlitecipher/.qmake.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
load(qt_build_config)
2+
CONFIG += warning_clean
3+
4+
QT_SOURCE_TREE = $$PWD
5+
QT_BUILD_TREE = $$shadowed($$PWD)
6+
7+
MODULE_VERSION = 5.11.1

‎sqlitecipher/sqlcachedresult.cpp‎

Lines changed: 0 additions & 315 deletions
This file was deleted.

0 commit comments

Comments
 (0)