diff --git a/.gitmodules b/.gitmodules index 81d528c0..403872d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -81,9 +81,6 @@ [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git -[submodule "qtjsondb"] - path = qtjsondb - url = ../qtjsondb.git [submodule "qt3d"] path = qt3d url = ../qt3d.git diff --git a/qt.pro b/qt.pro index b7a73797..15fd48ec 100644 --- a/qt.pro +++ b/qt.pro @@ -69,7 +69,6 @@ addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qt3d, qtdeclarative) -addModule(qtjsondb, qtdeclarative) addModule(qtsystems, qtbase, qtdeclarative) addModule(qtlocation, qtbase, qtsystems qtmultimedia) addModule(qtsensors, qtbase, qtdeclarative) @@ -85,7 +84,7 @@ addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) -addModule(qtdocgallery, qtdeclarative, qtjsondb) +addModule(qtdocgallery, qtdeclarative) linux:!android: addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) diff --git a/qtjsondb b/qtjsondb deleted file mode 160000 index 58223ab8..00000000 --- a/qtjsondb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58223ab8aaafe3d313863a9b757e9c9bd6243766