Permalink
Browse files

Remove support for QtScript (closes #44)

  • Loading branch information...
jlaine committed Aug 12, 2015
1 parent 9f2356c commit 725f3814303558e96e8192be5d8e7a581e32d077
View
@@ -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).
View
@@ -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
View
@@ -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
View
@@ -26,5 +26,4 @@
\sa Database
\sa Http
\sa Script
*/
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
SUBDIRS = http-server script-console
SUBDIRS = http-server

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -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
}
Oops, something went wrong.

0 comments on commit 725f381

Please sign in to comment.