Move sqlite source to the project root

Change-Id: I24e81770dadda3a649b30689409b72e4e5b06283
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

51 files changed, 56 insertions, 7 deletions

diff --git a/src/libs/sqlite/source/columndefinition.cpp b/src/libs/sqlite/columndefinition.cpp
index f61339c9cc..f61339c9cc 100644
--- a/src/libs/sqlite/source/columndefinition.cpp
+++ b/src/libs/sqlite/columndefinition.cpp
diff --git a/src/libs/sqlite/source/columndefinition.h b/src/libs/sqlite/columndefinition.h
index ed705b097e..ed705b097e 100644
--- a/src/libs/sqlite/source/columndefinition.h
+++ b/src/libs/sqlite/columndefinition.h
diff --git a/src/libs/sqlite/source/createtablecommand.cpp b/src/libs/sqlite/createtablecommand.cpp
index c8ace25a82..c8ace25a82 100644
--- a/src/libs/sqlite/source/createtablecommand.cpp
+++ b/src/libs/sqlite/createtablecommand.cpp
diff --git a/src/libs/sqlite/source/createtablecommand.h b/src/libs/sqlite/createtablecommand.h
index dbced745ff..dbced745ff 100644
--- a/src/libs/sqlite/source/createtablecommand.h
+++ b/src/libs/sqlite/createtablecommand.h
diff --git a/src/libs/sqlite/source/createtablesqlstatementbuilder.cpp b/src/libs/sqlite/createtablesqlstatementbuilder.cpp
index 8b4b81ac76..8b4b81ac76 100644
--- a/src/libs/sqlite/source/createtablesqlstatementbuilder.cpp
+++ b/src/libs/sqlite/createtablesqlstatementbuilder.cpp
diff --git a/src/libs/sqlite/source/createtablesqlstatementbuilder.h b/src/libs/sqlite/createtablesqlstatementbuilder.h
index 23e733a1c9..23e733a1c9 100644
--- a/src/libs/sqlite/source/createtablesqlstatementbuilder.h
+++ b/src/libs/sqlite/createtablesqlstatementbuilder.h
diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri
index 2df7b31187..35a02f55a6 100644
--- a/src/libs/sqlite/sqlite-lib.pri
+++ b/src/libs/sqlite/sqlite-lib.pri
@@ -4,10 +4,60 @@ contains(CONFIG, dll) {
     DEFINES += BUILD_SQLITE_STATIC_LIBRARY
 }
 
+INCLUDEPATH += $$PWD
+
 unix:LIBS += -ldl
 
 include(../3rdparty/sqlite/sqlite.pri)
-include(source/sqlite-source.pri)
+
+SOURCES += \
+    $$PWD/columndefinition.cpp \
+    $$PWD/createtablecommand.cpp \
+    $$PWD/createtablesqlstatementbuilder.cpp \
+    $$PWD/sqlitedatabasebackend.cpp \
+    $$PWD/sqlitedatabaseconnection.cpp \
+    $$PWD/sqlitedatabaseconnectionproxy.cpp \
+    $$PWD/sqliteexception.cpp \
+    $$PWD/sqliteglobal.cpp \
+    $$PWD/sqlitereadstatement.cpp \
+    $$PWD/sqlitereadwritestatement.cpp \
+    $$PWD/sqlitestatement.cpp \
+    $$PWD/sqlitetransaction.cpp \
+    $$PWD/sqliteworkerthread.cpp \
+    $$PWD/sqlitewritestatement.cpp \
+    $$PWD/sqlstatementbuilder.cpp \
+    $$PWD/sqlstatementbuilderexception.cpp \
+    $$PWD/utf8string.cpp \
+    $$PWD/utf8stringvector.cpp \
+    $$PWD/sqlitedatabase.cpp \
+    $$PWD/sqlitetable.cpp \
+    $$PWD/sqlitecolumn.cpp \
+    $$PWD/tablewriteworker.cpp \
+    $$PWD/tablewriteworkerproxy.cpp
+HEADERS += \
+    $$PWD/columndefinition.h \
+    $$PWD/createtablesqlstatementbuilder.h \
+    $$PWD/sqlitedatabasebackend.h \
+    $$PWD/sqlitedatabaseconnection.h \
+    $$PWD/sqlitedatabaseconnectionproxy.h \
+    $$PWD/sqliteexception.h \
+    $$PWD/sqliteglobal.h \
+    $$PWD/sqlitereadstatement.h \
+    $$PWD/sqlitereadwritestatement.h \
+    $$PWD/sqlitestatement.h \
+    $$PWD/sqlitetransaction.h \
+    $$PWD/sqliteworkerthread.h \
+    $$PWD/sqlitewritestatement.h \
+    $$PWD/sqlstatementbuilder.h \
+    $$PWD/sqlstatementbuilderexception.h \
+    $$PWD/utf8string.h \
+    $$PWD/utf8stringvector.h \
+    $$PWD/sqlitedatabase.h \
+    $$PWD/sqlitetable.h \
+    $$PWD/sqlitecolumn.h \
+    $$PWD/tablewriteworker.h \
+    $$PWD/tablewriteworkerproxy.h \
+    $$PWD/createtablecommand.h
 
 DEFINES += SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS4 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_UNLOCK_NOTIFY SQLITE_ENABLE_COLUMN_METADATA
 
diff --git a/src/libs/sqlite/source/sqlite-source.pri b/src/libs/sqlite/sqlite-source.pri
index b297e31da2..b297e31da2 100644
--- a/src/libs/sqlite/source/sqlite-source.pri
+++ b/src/libs/sqlite/sqlite-source.pri
diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs
index b64f157dfb..92ff6a6c51 100644
--- a/src/libs/sqlite/sqlite.qbs
+++ b/src/libs/sqlite/sqlite.qbs
@@ -1,9 +1,9 @@
-import qbs 1.0
+import qbs 1.0
 
 QtcLibrary {
     name: "Sqlite"
 
-    cpp.includePaths: base.concat(["../3rdparty/sqlite", "source"])
+    cpp.includePaths: base.concat(["../3rdparty/sqlite", "."])
     cpp.defines: base.concat([
         "BUILD_SQLITE_LIBRARY",
         "SQLITE_THREADSAFE=2",
@@ -27,7 +27,6 @@ QtcLibrary {
     }
 
     Group {
-        prefix: "source/"
         files: [
             "*.h",
             "*.cpp"
@@ -37,7 +36,7 @@ QtcLibrary {
     Export {
         cpp.includePaths: base.concat([
             "../3rdparty/sqlite",
-            "source"
+            "."
         ])
     }
 }
diff --git a/src/libs/sqlite/sqlite_dependencies.pri b/src/libs/sqlite/sqlite_dependencies.pri
index d5f6a22967..cb383c8e63 100644
--- a/src/libs/sqlite/sqlite_dependencies.pri
+++ b/src/libs/sqlite/sqlite_dependencies.pri
@@ -1,3 +1,3 @@
 QTC_LIB_NAME = Sqlite
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/sqlite
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite/source
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite
diff --git a/src/libs/sqlite/source/sqlitecolumn.cpp b/src/libs/sqlite/sqlitecolumn.cpp
index d4464ff152..d4464ff152 100644
--- a/src/libs/sqlite/source/sqlitecolumn.cpp
+++ b/src/libs/sqlite/sqlitecolumn.cpp
diff --git a/src/libs/sqlite/source/sqlitecolumn.h b/src/libs/sqlite/sqlitecolumn.h
index 99eb4dc2df..99eb4dc2df 100644
--- a/src/libs/sqlite/source/sqlitecolumn.h
+++ b/src/libs/sqlite/sqlitecolumn.h
diff --git a/src/libs/sqlite/source/sqlitedatabase.cpp b/src/libs/sqlite/sqlitedatabase.cpp
index e045839ae7..e045839ae7 100644
--- a/src/libs/sqlite/source/sqlitedatabase.cpp
+++ b/src/libs/sqlite/sqlitedatabase.cpp
diff --git a/src/libs/sqlite/source/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h
index c20ff8a39f..c20ff8a39f 100644
--- a/src/libs/sqlite/source/sqlitedatabase.h
+++ b/src/libs/sqlite/sqlitedatabase.h
diff --git a/src/libs/sqlite/source/sqlitedatabasebackend.cpp b/src/libs/sqlite/sqlitedatabasebackend.cpp
index bfb366e55e..bfb366e55e 100644
--- a/src/libs/sqlite/source/sqlitedatabasebackend.cpp
+++ b/src/libs/sqlite/sqlitedatabasebackend.cpp
diff --git a/src/libs/sqlite/source/sqlitedatabasebackend.h b/src/libs/sqlite/sqlitedatabasebackend.h
index 17cf5b7973..17cf5b7973 100644
--- a/src/libs/sqlite/source/sqlitedatabasebackend.h
+++ b/src/libs/sqlite/sqlitedatabasebackend.h
diff --git a/src/libs/sqlite/source/sqlitedatabaseconnection.cpp b/src/libs/sqlite/sqlitedatabaseconnection.cpp
index b3c910a345..b3c910a345 100644
--- a/src/libs/sqlite/source/sqlitedatabaseconnection.cpp
+++ b/src/libs/sqlite/sqlitedatabaseconnection.cpp
diff --git a/src/libs/sqlite/source/sqlitedatabaseconnection.h b/src/libs/sqlite/sqlitedatabaseconnection.h
index 838d7cb0c0..838d7cb0c0 100644
--- a/src/libs/sqlite/source/sqlitedatabaseconnection.h
+++ b/src/libs/sqlite/sqlitedatabaseconnection.h
diff --git a/src/libs/sqlite/source/sqlitedatabaseconnectionproxy.cpp b/src/libs/sqlite/sqlitedatabaseconnectionproxy.cpp
index d59fda0672..d59fda0672 100644
--- a/src/libs/sqlite/source/sqlitedatabaseconnectionproxy.cpp
+++ b/src/libs/sqlite/sqlitedatabaseconnectionproxy.cpp
diff --git a/src/libs/sqlite/source/sqlitedatabaseconnectionproxy.h b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h
index 4d5e62e812..4d5e62e812 100644
--- a/src/libs/sqlite/source/sqlitedatabaseconnectionproxy.h
+++ b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h
diff --git a/src/libs/sqlite/source/sqliteexception.cpp b/src/libs/sqlite/sqliteexception.cpp
index b813bf2d6e..b813bf2d6e 100644
--- a/src/libs/sqlite/source/sqliteexception.cpp
+++ b/src/libs/sqlite/sqliteexception.cpp
diff --git a/src/libs/sqlite/source/sqliteexception.h b/src/libs/sqlite/sqliteexception.h
index 6553c70bf7..6553c70bf7 100644
--- a/src/libs/sqlite/source/sqliteexception.h
+++ b/src/libs/sqlite/sqliteexception.h
diff --git a/src/libs/sqlite/source/sqliteglobal.cpp b/src/libs/sqlite/sqliteglobal.cpp
index 22b037bb84..22b037bb84 100644
--- a/src/libs/sqlite/source/sqliteglobal.cpp
+++ b/src/libs/sqlite/sqliteglobal.cpp
diff --git a/src/libs/sqlite/source/sqliteglobal.h b/src/libs/sqlite/sqliteglobal.h
index 193d7a4653..193d7a4653 100644
--- a/src/libs/sqlite/source/sqliteglobal.h
+++ b/src/libs/sqlite/sqliteglobal.h
diff --git a/src/libs/sqlite/source/sqlitereadstatement.cpp b/src/libs/sqlite/sqlitereadstatement.cpp
index 15244ca6dd..15244ca6dd 100644
--- a/src/libs/sqlite/source/sqlitereadstatement.cpp
+++ b/src/libs/sqlite/sqlitereadstatement.cpp
diff --git a/src/libs/sqlite/source/sqlitereadstatement.h b/src/libs/sqlite/sqlitereadstatement.h
index 9e164db6d6..9e164db6d6 100644
--- a/src/libs/sqlite/source/sqlitereadstatement.h
+++ b/src/libs/sqlite/sqlitereadstatement.h
diff --git a/src/libs/sqlite/source/sqlitereadwritestatement.cpp b/src/libs/sqlite/sqlitereadwritestatement.cpp
index 4096e15bc0..4096e15bc0 100644
--- a/src/libs/sqlite/source/sqlitereadwritestatement.cpp
+++ b/src/libs/sqlite/sqlitereadwritestatement.cpp
diff --git a/src/libs/sqlite/source/sqlitereadwritestatement.h b/src/libs/sqlite/sqlitereadwritestatement.h
index fa1ae0c6d4..fa1ae0c6d4 100644
--- a/src/libs/sqlite/source/sqlitereadwritestatement.h
+++ b/src/libs/sqlite/sqlitereadwritestatement.h
diff --git a/src/libs/sqlite/source/sqlitestatement.cpp b/src/libs/sqlite/sqlitestatement.cpp
index 81acf4a5a1..81acf4a5a1 100644
--- a/src/libs/sqlite/source/sqlitestatement.cpp
+++ b/src/libs/sqlite/sqlitestatement.cpp
diff --git a/src/libs/sqlite/source/sqlitestatement.h b/src/libs/sqlite/sqlitestatement.h
index fe0f3c3564..fe0f3c3564 100644
--- a/src/libs/sqlite/source/sqlitestatement.h
+++ b/src/libs/sqlite/sqlitestatement.h
diff --git a/src/libs/sqlite/source/sqlitetable.cpp b/src/libs/sqlite/sqlitetable.cpp
index 4b007b5737..4b007b5737 100644
--- a/src/libs/sqlite/source/sqlitetable.cpp
+++ b/src/libs/sqlite/sqlitetable.cpp
diff --git a/src/libs/sqlite/source/sqlitetable.h b/src/libs/sqlite/sqlitetable.h
index 754137a413..754137a413 100644
--- a/src/libs/sqlite/source/sqlitetable.h
+++ b/src/libs/sqlite/sqlitetable.h
diff --git a/src/libs/sqlite/source/sqlitetransaction.cpp b/src/libs/sqlite/sqlitetransaction.cpp
index 4d2b5d19b0..4d2b5d19b0 100644
--- a/src/libs/sqlite/source/sqlitetransaction.cpp
+++ b/src/libs/sqlite/sqlitetransaction.cpp
diff --git a/src/libs/sqlite/source/sqlitetransaction.h b/src/libs/sqlite/sqlitetransaction.h
index 05a000bef0..05a000bef0 100644
--- a/src/libs/sqlite/source/sqlitetransaction.h
+++ b/src/libs/sqlite/sqlitetransaction.h
diff --git a/src/libs/sqlite/source/sqliteworkerthread.cpp b/src/libs/sqlite/sqliteworkerthread.cpp
index d99336f52a..d99336f52a 100644
--- a/src/libs/sqlite/source/sqliteworkerthread.cpp
+++ b/src/libs/sqlite/sqliteworkerthread.cpp
diff --git a/src/libs/sqlite/source/sqliteworkerthread.h b/src/libs/sqlite/sqliteworkerthread.h
index 5960347129..5960347129 100644
--- a/src/libs/sqlite/source/sqliteworkerthread.h
+++ b/src/libs/sqlite/sqliteworkerthread.h
diff --git a/src/libs/sqlite/source/sqlitewritestatement.cpp b/src/libs/sqlite/sqlitewritestatement.cpp
index 17312f626e..17312f626e 100644
--- a/src/libs/sqlite/source/sqlitewritestatement.cpp
+++ b/src/libs/sqlite/sqlitewritestatement.cpp
diff --git a/src/libs/sqlite/source/sqlitewritestatement.h b/src/libs/sqlite/sqlitewritestatement.h
index ae7dafdb88..ae7dafdb88 100644
--- a/src/libs/sqlite/source/sqlitewritestatement.h
+++ b/src/libs/sqlite/sqlitewritestatement.h
diff --git a/src/libs/sqlite/source/sqlstatementbuilder.cpp b/src/libs/sqlite/sqlstatementbuilder.cpp
index bec76032f6..bec76032f6 100644
--- a/src/libs/sqlite/source/sqlstatementbuilder.cpp
+++ b/src/libs/sqlite/sqlstatementbuilder.cpp
diff --git a/src/libs/sqlite/source/sqlstatementbuilder.h b/src/libs/sqlite/sqlstatementbuilder.h
index 8d02fed7d6..8d02fed7d6 100644
--- a/src/libs/sqlite/source/sqlstatementbuilder.h
+++ b/src/libs/sqlite/sqlstatementbuilder.h
diff --git a/src/libs/sqlite/source/sqlstatementbuilderexception.cpp b/src/libs/sqlite/sqlstatementbuilderexception.cpp
index b66277f972..b66277f972 100644
--- a/src/libs/sqlite/source/sqlstatementbuilderexception.cpp
+++ b/src/libs/sqlite/sqlstatementbuilderexception.cpp
diff --git a/src/libs/sqlite/source/sqlstatementbuilderexception.h b/src/libs/sqlite/sqlstatementbuilderexception.h
index aa3c3bcd01..aa3c3bcd01 100644
--- a/src/libs/sqlite/source/sqlstatementbuilderexception.h
+++ b/src/libs/sqlite/sqlstatementbuilderexception.h
diff --git a/src/libs/sqlite/source/tablewriteworker.cpp b/src/libs/sqlite/tablewriteworker.cpp
index a9be3f42f6..a9be3f42f6 100644
--- a/src/libs/sqlite/source/tablewriteworker.cpp
+++ b/src/libs/sqlite/tablewriteworker.cpp
diff --git a/src/libs/sqlite/source/tablewriteworker.h b/src/libs/sqlite/tablewriteworker.h
index 4002dad776..4002dad776 100644
--- a/src/libs/sqlite/source/tablewriteworker.h
+++ b/src/libs/sqlite/tablewriteworker.h
diff --git a/src/libs/sqlite/source/tablewriteworkerproxy.cpp b/src/libs/sqlite/tablewriteworkerproxy.cpp
index 74a35b55b7..74a35b55b7 100644
--- a/src/libs/sqlite/source/tablewriteworkerproxy.cpp
+++ b/src/libs/sqlite/tablewriteworkerproxy.cpp
diff --git a/src/libs/sqlite/source/tablewriteworkerproxy.h b/src/libs/sqlite/tablewriteworkerproxy.h
index e53fb63a10..e53fb63a10 100644
--- a/src/libs/sqlite/source/tablewriteworkerproxy.h
+++ b/src/libs/sqlite/tablewriteworkerproxy.h
diff --git a/src/libs/sqlite/source/utf8string.cpp b/src/libs/sqlite/utf8string.cpp
index fd19020439..fd19020439 100644
--- a/src/libs/sqlite/source/utf8string.cpp
+++ b/src/libs/sqlite/utf8string.cpp
diff --git a/src/libs/sqlite/source/utf8string.h b/src/libs/sqlite/utf8string.h
index b3e43694a6..b3e43694a6 100644
--- a/src/libs/sqlite/source/utf8string.h
+++ b/src/libs/sqlite/utf8string.h
diff --git a/src/libs/sqlite/source/utf8stringvector.cpp b/src/libs/sqlite/utf8stringvector.cpp
index 92d8319de8..92d8319de8 100644
--- a/src/libs/sqlite/source/utf8stringvector.cpp
+++ b/src/libs/sqlite/utf8stringvector.cpp
diff --git a/src/libs/sqlite/source/utf8stringvector.h b/src/libs/sqlite/utf8stringvector.h
index 0745dc000d..0745dc000d 100644
--- a/src/libs/sqlite/source/utf8stringvector.h
+++ b/src/libs/sqlite/utf8stringvector.h
diff --git a/src/tools/codemodelbackend/codemodelbackend.pri b/src/tools/codemodelbackend/codemodelbackend.pri
index 19b0e159a4..adecfde825 100644
--- a/src/tools/codemodelbackend/codemodelbackend.pri
+++ b/src/tools/codemodelbackend/codemodelbackend.pri
@@ -23,7 +23,7 @@ LIBS += $$LLVM_LIBS
 INCLUDEPATH += $$LLVM_INCLUDEPATH
 
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite/source
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite
 
 SOURCES += codemodelbackendmain.cpp