summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/sqlite
ModeNameSize
-rw-r--r--qsql_sqlite.cpp21158logstatsplain
-rw-r--r--qsql_sqlite.h3540logstatsplain
larativeui Conflicts: src/declarative/qml/parser/qmljsparser.cpp | * | Libraries and library versioning.Warwick Allison2009-07-1428-1003/+2145 | | | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-12581-30278/+23248 | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlscriptparser.cpp src/declarative/qml/qmlscriptparser_p.h Compiles, but probably next needs a revert/change of module stuff, since that work seems to have been duplicated. | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-092039-156336/+219307 | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp | * | | | Allow relative URLsWarwick Allison2009-07-091-3/+2 | | | | | | * | | | URL can convert from string or bytearray.Warwick Allison2009-07-091-1/+1 | | | | | | * | | | New module handling: allow "import" of built-in types.Warwick Allison2009-07-024-8/+51 | | | | | | | | | | | | | | | | | | | | | | | | | This will allow, for example, a different set of types to be imported for "import Qt 4.6" than for "import Qt 4.7". | * | | | First conversion to new module handling.Warwick Allison2009-07-0212-197/+116 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Works same as before for now, but now the variables and methods are all in the right place. In particular, type resolving is per-component, not per-engine, even though it is the engine that ultimately has the ability to find types, because each component will have a different set of available types. Designed to be optimizable - QmlEngine could share data between QmlEngine::Import objects, and the import objects could read types in bulk rather than always searching. | * | | | Smooth, but never anti-alias the edges of pixmaps that need to stitch..Warwick Allison2009-07-021-5/+5 | | | | | | | | | | | | | | | | | | | | Bug 256967 still stops it working correctly. | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-0254-1409/+1518 | |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-01212-622/+2288 | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-06-30