Remove support for QtScript (closes #44)

jlaine · Aug 12, 2015 · 725f381 · 725f381
1 parent 9f2356c
commit 725f381
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 817 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,5 @@
 QDjango 0.6.0 (UNRELEASED)
+ * Remove support for QtScript.
  * Make tests runnable using "make check".
  * Fix build errors on Windows.
  * Clarify return values of createTable(s) and dropTable(s).

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Qt 4 on Debian:
 
 Qt 5 on Debian:
 
-    sudo apt-get install qtbase5-dev qtscript5-dev
+    sudo apt-get install qtbase5-dev
 
 Qt 4 on Mac OS X:
 
@@ -61,4 +61,4 @@ Fast forward cursors are used by default. This greatly improves performance, and
 
 - Connection pooling must be enabled in your [ODBC manager](http://www.unixodbc.org/doc/conn_pool.html)
 - You must enable Multiple Active Result Sets in the QODBC driver using "MARS_Connection=Yes" in the connection string
-- You must enable connection pooling in the QODBC driver using the "SQL_ATTR_CONNECTION_POOLING" attribute
+- You must enable connection pooling in the QODBC driver using the "SQL_ATTR_CONNECTION_POOLING" attribute
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -574,7 +574,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = database.doc http.doc index.doc models.doc queries.doc script.doc ../src/db ../src/http ../src/script
+INPUT                  = database.doc http.doc index.doc models.doc queries.doc ../src/db ../src/http
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/doc/index.doc b/doc/index.doc
@@ -26,5 +26,4 @@
 
     \sa Database
     \sa Http
-    \sa Script
 */
diff --git a/doc/script.doc b/doc/script.doc
diff --git a/examples/examples.pro b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = http-server script-console
+SUBDIRS = http-server
diff --git a/examples/script-console/script-console.cpp b/examples/script-console/script-console.cpp
diff --git a/examples/script-console/script-console.pro b/examples/script-console/script-console.pro
diff --git a/qdjango.pri b/qdjango.pri
@@ -11,18 +11,16 @@ isEmpty(QDJANGO_LIBRARY_TYPE) {
 }
 
 # Libraries for apps which use QDjango
-QDJANGO_INCLUDEPATH = $$PWD/src/db $$PWD/src/http $$PWD/src/script
+QDJANGO_INCLUDEPATH = $$PWD/src/db $$PWD/src/http
 QDJANGO_DB_LIBS = -lqdjango-db
 QDJANGO_HTTP_LIBS = -lqdjango-http
-QDJANGO_SCRIPT_LIBS = -lqdjango-script
 contains(QDJANGO_LIBRARY_TYPE,staticlib) {
     DEFINES += QDJANGO_STATIC
 } else {
     # Windows needs the major library version
     win32 {
         QDJANGO_DB_LIBS = -lqdjango-db0
         QDJANGO_HTTP_LIBS = -lqdjango-http0
-        QDJANGO_SCRIPT_LIBS = -lqdjango-script0
     }
     DEFINES += QDJANGO_SHARED
 }