grantlee:grantlee.git
4 years agoBump the version to 1.0.0.
Stephen Kelly [Mon, 2 Sep 2013 18:46:49 +0000 (20:46 +0200)]
Bump the version to 1.0.0.

4 years agow
Stephen Kelly [Tue, 3 Sep 2013 14:48:38 +0000 (16:48 +0200)]
w

4 years agoAlways use QStringBuilder.
Stephen Kelly [Tue, 3 Sep 2013 13:51:55 +0000 (15:51 +0200)]
Always use QStringBuilder.

4 years agoMake the template error accessors const.
Stephen Kelly [Tue, 3 Sep 2013 15:08:14 +0000 (17:08 +0200)]
Make the template error accessors const.

4 years agoMake the Grantlee::Node::render method const.
Stephen Kelly [Tue, 16 Nov 2010 13:09:39 +0000 (14:09 +0100)]
Make the Grantlee::Node::render method const.

find -name *.cpp | xargs sed -i 's/::render\(.*\)/::render\1 const/'
find -name *.h | xargs sed -i 's/void render\(.*\);/void render\1 const;/'

4 years agoMove object access logic to metatype.cpp
Stephen Kelly [Wed, 11 Sep 2013 12:46:04 +0000 (14:46 +0200)]
Move object access logic to metatype.cpp

It is not needed for public use anymore, as we rely on Qt for that
now.

4 years agoRemove specialized container access code from Grantlee.
Stephen Kelly [Wed, 11 Sep 2013 12:19:39 +0000 (14:19 +0200)]
Remove specialized container access code from Grantlee.

The logic for accessing containers, smart pointers to QObject derived
types and QObject subclasses is now part of Qt.

The TypeAccessors remain for custom 3rd party types.

4 years agoRemove redundant Q_DECLARE_METATYPE declarations.
Stephen Kelly [Tue, 3 Sep 2013 12:34:02 +0000 (14:34 +0200)]
Remove redundant Q_DECLARE_METATYPE declarations.

4 years agoUpdate the date format in the french locale.
Stephen Kelly [Mon, 2 Sep 2013 16:09:47 +0000 (18:09 +0200)]
Update the date format in the french locale.

This has changed in Qt 5.

At this point all tests pass again.

4 years agoSpecialize some Qt templates for custom containers under test.
Stephen Kelly [Tue, 3 Sep 2013 12:07:54 +0000 (14:07 +0200)]
Specialize some Qt templates for custom containers under test.

4 years agoUse new QVariant container iteration features from Qt 5.
Stephen Kelly [Mon, 2 Sep 2013 18:09:49 +0000 (20:09 +0200)]
Use new QVariant container iteration features from Qt 5.

This will removal of Grantlee metatype functions and macros
providing similar features.

4 years agoUse new feature of extracting a QObject* from QVariant.
Stephen Kelly [Tue, 3 Sep 2013 14:04:57 +0000 (16:04 +0200)]
Use new feature of extracting a QObject* from QVariant.

This will allow removal of Grantlee metatype functions and macros
providing similar features (including smart pointers).

4 years agoRemove Qt 4 compatbility code.
Stephen Kelly [Tue, 3 Sep 2013 11:15:49 +0000 (13:15 +0200)]
Remove Qt 4 compatbility code.

4 years agoPort to qt5 CMake macros.
Stephen Kelly [Mon, 2 Sep 2013 15:03:29 +0000 (17:03 +0200)]
Port to qt5 CMake macros.

4 years agoPort the remaining C++ code to Qt 5.
Stephen Kelly [Mon, 2 Sep 2013 18:47:59 +0000 (20:47 +0200)]
Port the remaining C++ code to Qt 5.

At this point, everything compiles with Qt 5, but the tests
all fail.

4 years agoPort from QObject-tracking QWeakPointer to QPointer.
Stephen Kelly [Mon, 2 Sep 2013 18:33:13 +0000 (20:33 +0200)]
Port from QObject-tracking QWeakPointer to QPointer.

4 years agoPort to Qt 5. Use IMPORTED targets from Qt 5.
Stephen Kelly [Mon, 2 Sep 2013 14:10:54 +0000 (16:10 +0200)]
Port to Qt 5. Use IMPORTED targets from Qt 5.

4 years agoChange the library names to Grantlee::Templates and Grantlee::TextDocument
Stephen Kelly [Tue, 3 Sep 2013 09:13:48 +0000 (11:13 +0200)]
Change the library names to Grantlee::Templates and Grantlee::TextDocument

These have been the non-deprecated names for quite some time.

4 years agoSimplify the GrantleeConfig file.
Stephen Kelly [Tue, 3 Sep 2013 08:56:19 +0000 (10:56 +0200)]
Simplify the GrantleeConfig file.

There is no need to guard the include of the Targets file as of
CMake 2.8.11.

Remove compatibility variables.

Don't set variables for include dirs and other directories which
are not needed. Expect the use of IMPORTED targets instead.

4 years agoRemove includes and defines from the Grantlee_USE_FILE.
Stephen Kelly [Tue, 3 Sep 2013 08:52:40 +0000 (10:52 +0200)]
Remove includes and defines from the Grantlee_USE_FILE.

The Qt includes and defines from the QT_USE_FILE are obsoleted
by target usage requirements in CMake 2.8.11.

Grantlee ships no useful cmake modules, so no need to adjust
the cmake module path.

4 years agoRemove grantlee_add_plugin macro. Add macro to adjust plugin name.
Stephen Kelly [Tue, 3 Sep 2013 08:33:42 +0000 (10:33 +0200)]
Remove grantlee_add_plugin macro. Add macro to adjust plugin name.

The grantlee_add_plugin macro predates automoc, and was partly
added to simplify moc'ing. Now we expect downstreams to use
CMAKE_AUTOMOC or to otherwise handle the moc issue themselves.

Additionally, make downstream linking to grantlee_core more explicit
by not hiding it in a macro.

The code to add all sources to a global property is specific to
the Grantlee build for coverage analysis, and is not relevant to
downstreams anyway.

4 years agoRemove macro-implemented plugin export.
Stephen Kelly [Mon, 2 Sep 2013 18:37:29 +0000 (20:37 +0200)]
Remove macro-implemented plugin export.

This is now determined by moc and otherwise causes Qt 5 builds to
fail.

4 years agoRemove auto-registration of types in the metatype system.
Stephen Kelly [Mon, 2 Sep 2013 18:00:38 +0000 (20:00 +0200)]
Remove auto-registration of types in the metatype system.

This is obsoleted by new features in Qt 5. In the Qt 4 build, this
makes all of the tests fail. They will pass again when the port
to Qt 5 is complete.

4 years agoTemporarily add some macros to help Qt 5 porting source compatibility.
Stephen Kelly [Mon, 2 Sep 2013 15:00:36 +0000 (17:00 +0200)]
Temporarily add some macros to help Qt 5 porting source compatibility.

4 years agoAdd Q_PLUGIN_METADATA tags to plugins.
Stephen Kelly [Mon, 2 Sep 2013 17:54:06 +0000 (19:54 +0200)]
Add Q_PLUGIN_METADATA tags to plugins.

4 years agoModernize the documentation.
Stephen Kelly [Mon, 2 Sep 2013 11:51:16 +0000 (13:51 +0200)]
Modernize the documentation.

4 years agoFix up the plugin pointer test.
Stephen Kelly [Mon, 2 Sep 2013 11:50:36 +0000 (13:50 +0200)]
Fix up the plugin pointer test.

4 years agoRemove redundant include_directories calls and definitions.
Stephen Kelly [Mon, 2 Sep 2013 11:29:34 +0000 (13:29 +0200)]
Remove redundant include_directories calls and definitions.

4 years agoAdd include directory for scriptable_tags at target scope.
Stephen Kelly [Mon, 2 Sep 2013 11:30:49 +0000 (13:30 +0200)]
Add include directory for scriptable_tags at target scope.

4 years agoAuto-populate the INTERFACE_INCLUDE_DIRECTORIES proprerty.
Stephen Kelly [Mon, 2 Sep 2013 11:26:17 +0000 (13:26 +0200)]
Auto-populate the INTERFACE_INCLUDE_DIRECTORIES proprerty.

4 years agoRemove redundancy in Qt target listings.
Stephen Kelly [Mon, 2 Sep 2013 11:23:41 +0000 (13:23 +0200)]
Remove redundancy in Qt target listings.

4 years agoSet target properties for hidden visibility.
Stephen Kelly [Mon, 2 Sep 2013 10:15:49 +0000 (12:15 +0200)]
Set target properties for hidden visibility.

Don't use the obsolete function from GenerateExportHeader.

4 years agoIncrease minimum CMake version to 2.8.11.
Stephen Kelly [Mon, 2 Sep 2013 10:08:03 +0000 (12:08 +0200)]
Increase minimum CMake version to 2.8.11.

4 years agoAdd API for resolving variables to strings in QtScript.
Stephen Kelly [Sat, 21 Sep 2013 09:41:22 +0000 (11:41 +0200)]
Add API for resolving variables to strings in QtScript.

4 years agoFix the htmlapps example with Qt 4.8+
Stephen Kelly [Sat, 21 Sep 2013 08:44:09 +0000 (10:44 +0200)]
Fix the htmlapps example with Qt 4.8+

A behavior change exposed a bug in the QNetworkReply subclass. Account
for the buffer in the base.

4 years agoAdd missing includes.
Stephen Kelly [Wed, 11 Sep 2013 12:30:35 +0000 (14:30 +0200)]
Add missing includes.

4 years agoReplace module includes with class includes in examples.
Stephen Kelly [Fri, 6 Sep 2013 15:51:57 +0000 (17:51 +0200)]
Replace module includes with class includes in examples.

This is more portable to Qt 5.

4 years agoComment out the identica page.
Stephen Kelly [Fri, 6 Sep 2013 15:43:28 +0000 (17:43 +0200)]
Comment out the identica page.

It no longer provides an rss feed.

4 years agoLoad jQuery by the correct version.
Stephen Kelly [Fri, 6 Sep 2013 15:42:20 +0000 (17:42 +0200)]
Load jQuery by the correct version.

4 years agoReplace old compressed jquery with the latest release.
Stephen Kelly [Fri, 6 Sep 2013 15:18:48 +0000 (17:18 +0200)]
Replace old compressed jquery with the latest release.

This example does not work anyway because QIODevice::peek is not
virtual. Hopefully this can be worked around with Qt 5.

4 years agoDon't try to read from a null QObject*.
Stephen Kelly [Thu, 5 Sep 2013 09:18:04 +0000 (11:18 +0200)]
Don't try to read from a null QObject*.

4 years agoDon't uselessly store the template as a member.
Stephen Kelly [Tue, 3 Sep 2013 15:12:51 +0000 (17:12 +0200)]
Don't uselessly store the template as a member.

4 years agoFix build in the presence of QStringBuilder.
Stephen Kelly [Tue, 3 Sep 2013 13:50:47 +0000 (15:50 +0200)]
Fix build in the presence of QStringBuilder.

4 years agoAvoid unsigned comparison with 0 warning.
Stephen Kelly [Tue, 3 Sep 2013 13:54:33 +0000 (15:54 +0200)]
Avoid unsigned comparison with 0 warning.

When GRANTLEE_MIN_PLUGIN_VERSION is reset to zero, we would otherwise
get a warning from this code.

4 years agoRead SOURCES directly from targets for the cccc target.
Stephen Kelly [Tue, 3 Sep 2013 11:03:21 +0000 (13:03 +0200)]
Read SOURCES directly from targets for the cccc target.

Don't maintain a GLOBAL property containing the source lists.

4 years agoInstall the grantlee_textdocument.h header.
Stephen Kelly [Tue, 3 Sep 2013 10:51:17 +0000 (12:51 +0200)]
Install the grantlee_textdocument.h header.

4 years agoUse non-deprecated variables.
Stephen Kelly [Tue, 3 Sep 2013 10:46:33 +0000 (12:46 +0200)]
Use non-deprecated variables.

4 years agoUse the non-obsolete grantlee_templates header where needed.
Stephen Kelly [Tue, 3 Sep 2013 10:17:36 +0000 (12:17 +0200)]
Use the non-obsolete grantlee_templates header where needed.

4 years agoGenerate the min plugin version from the major version.
Stephen Kelly [Tue, 3 Sep 2013 10:14:00 +0000 (12:14 +0200)]
Generate the min plugin version from the major version.

4 years agoSet the SOVERSION to the Grantlee major version.
Stephen Kelly [Mon, 2 Sep 2013 17:56:52 +0000 (19:56 +0200)]
Set the SOVERSION to the Grantlee major version.

4 years agoAdd a convenience buildsystem for the examples.
Stephen Kelly [Tue, 3 Sep 2013 10:27:43 +0000 (12:27 +0200)]
Add a convenience buildsystem for the examples.

4 years agoDon't rely on order for QSet related tests.
Stephen Kelly [Mon, 2 Sep 2013 16:12:17 +0000 (18:12 +0200)]
Don't rely on order for QSet related tests.

In Qt 5 this is not deterministic.

4 years agoRemove stray debug output.
Stephen Kelly [Mon, 2 Sep 2013 16:16:34 +0000 (18:16 +0200)]
Remove stray debug output.

4 years agoReturn the library if it is found.
Stephen Kelly [Mon, 2 Sep 2013 15:20:51 +0000 (17:20 +0200)]
Return the library if it is found.

This fixes a regression in commit 0ee5d83d (Ensure that we never
decrement a uint below 0., 2013-09-02).

4 years agoDon't rely on order of elements in QHash.
Stephen Kelly [Mon, 2 Sep 2013 14:43:26 +0000 (16:43 +0200)]
Don't rely on order of elements in QHash.

In Qt 5, this is not determinate.

4 years agoEnsure that we never decrement a uint below 0.
Stephen Kelly [Mon, 2 Sep 2013 14:42:08 +0000 (16:42 +0200)]
Ensure that we never decrement a uint below 0.

4 years agoAdd missing include.
Stephen Kelly [Mon, 2 Sep 2013 12:58:04 +0000 (14:58 +0200)]
Add missing include.

4 years agoUse an empty endmacro() command.
Stephen Kelly [Mon, 2 Sep 2013 11:52:10 +0000 (13:52 +0200)]
Use an empty endmacro() command.

4 years agoUse list(APPEND) where appropriate.
Stephen Kelly [Mon, 2 Sep 2013 11:31:22 +0000 (13:31 +0200)]
Use list(APPEND) where appropriate.

4 years agoUse CMAKE_AUTOMOC instead of qt4_automoc.
Stephen Kelly [Mon, 2 Sep 2013 11:15:36 +0000 (13:15 +0200)]
Use CMAKE_AUTOMOC instead of qt4_automoc.

4 years agoIncrease the CMake requirement for examples and tests.
Stephen Kelly [Mon, 2 Sep 2013 11:13:49 +0000 (13:13 +0200)]
Increase the CMake requirement for examples and tests.

Match the requirement of grantlee itself.

4 years agoUse Qt4 IMPORTED target names directly.
Stephen Kelly [Mon, 2 Sep 2013 11:10:55 +0000 (13:10 +0200)]
Use Qt4 IMPORTED target names directly.

Instead of using variables.

4 years agoRemove unneeded find_package(Qt4)
Stephen Kelly [Mon, 2 Sep 2013 11:09:18 +0000 (13:09 +0200)]
Remove unneeded find_package(Qt4)

GrantleeConfig already does this.

4 years agoRemove unneeded QT_NO_KEYWORDS definition.
Stephen Kelly [Mon, 2 Sep 2013 11:08:57 +0000 (13:08 +0200)]
Remove unneeded QT_NO_KEYWORDS definition.

4 years agoAdd some uniformity to command invocation.
Stephen Kelly [Mon, 2 Sep 2013 11:07:49 +0000 (13:07 +0200)]
Add some uniformity to command invocation.

4 years agoPrefer CMAKE_INCLUDE_CURRENT_DIR over explicit binary dir listing.
Stephen Kelly [Mon, 2 Sep 2013 10:49:38 +0000 (12:49 +0200)]
Prefer CMAKE_INCLUDE_CURRENT_DIR over explicit binary dir listing.

4 years agoDon't use QT_NO_KEYWORDS in examples.
Stephen Kelly [Mon, 2 Sep 2013 10:47:56 +0000 (12:47 +0200)]
Don't use QT_NO_KEYWORDS in examples.

It is not really needed.

4 years agoUse Qt4 IMPORTED target names directly.
Stephen Kelly [Mon, 2 Sep 2013 10:28:35 +0000 (12:28 +0200)]
Use Qt4 IMPORTED target names directly.

Instead of using variables.

4 years agoRemove QT_DEFINITIONS where not needed.
Stephen Kelly [Mon, 2 Sep 2013 10:27:53 +0000 (12:27 +0200)]
Remove QT_DEFINITIONS where not needed.

Grantlee_USE_FILE already does this (via QT_USE_FILE).

4 years agoRemove add_definitions(-DQT_GUI_LIB) where not needed.
Stephen Kelly [Mon, 2 Sep 2013 10:27:25 +0000 (12:27 +0200)]
Remove add_definitions(-DQT_GUI_LIB) where not needed.

4 years agoRemove some find_package(Qt4) calls.
Stephen Kelly [Mon, 2 Sep 2013 10:26:15 +0000 (12:26 +0200)]
Remove some find_package(Qt4) calls.

GrantleeConfig.cmake already does this.

4 years agoDon't use multiple add_definitions calls where one will do.
Stephen Kelly [Mon, 2 Sep 2013 10:17:30 +0000 (12:17 +0200)]
Don't use multiple add_definitions calls where one will do.

4 years agoAdd missing newline.
Stephen Kelly [Mon, 2 Sep 2013 10:10:22 +0000 (12:10 +0200)]
Add missing newline.

4 years agoPort away from CMAKE_AUTOMOC_RELAXED_MODE.
Stephen Kelly [Mon, 2 Sep 2013 10:05:21 +0000 (12:05 +0200)]
Port away from CMAKE_AUTOMOC_RELAXED_MODE.

4 years agoRemove use of obsolete IMMEDIATE option.
Stephen Kelly [Mon, 2 Sep 2013 10:01:29 +0000 (12:01 +0200)]
Remove use of obsolete IMMEDIATE option.

4 years agoFix memory leak - delete private instance.
Stephen Kelly [Mon, 2 Sep 2013 08:35:56 +0000 (10:35 +0200)]
Fix memory leak - delete private instance.

4 years agoAvoid manipulation of CMAKE_BUILD_TYPE when it is not there.
Stephen Kelly [Thu, 4 Jul 2013 09:12:22 +0000 (11:12 +0200)]
Avoid manipulation of CMAKE_BUILD_TYPE when it is not there.

4 years agoUse the LINK_ scope keywords and IMPORTED targets directly with tll().
Stephen Kelly [Fri, 15 Mar 2013 17:39:01 +0000 (18:39 +0100)]
Use the LINK_ scope keywords and IMPORTED targets directly with tll().

4 years agoTrim trailing whitespace.
Stephen Kelly [Fri, 15 Mar 2013 17:36:03 +0000 (18:36 +0100)]
Trim trailing whitespace.

4 years agoUse to/fromLatin1 instead of to/fromAscii
Stephen Kelly [Fri, 15 Mar 2013 17:35:23 +0000 (18:35 +0100)]
Use to/fromLatin1 instead of to/fromAscii

The latter is deprecated, and usually calls the former anyway.

4 years agoRemove version variables from the Config file.
Stephen Kelly [Fri, 15 Mar 2013 17:30:38 +0000 (18:30 +0100)]
Remove version variables from the Config file.

These are already set by CMake because we have a ConfigVersion file.

4 years agoUse CMake to generate a ConfigVersion file.
Stephen Kelly [Fri, 15 Mar 2013 17:29:35 +0000 (18:29 +0100)]
Use CMake to generate a ConfigVersion file.

Instead of maintaining the file template here.

4 years agoNamespace the variable for the root directory of the package.
Stephen Kelly [Fri, 15 Mar 2013 17:25:39 +0000 (18:25 +0100)]
Namespace the variable for the root directory of the package.

Otherwise things like this can cause problems if the same variable
is used by a downstream, or by another upstream of a Grantlee downstream.

4 years agoUse CMAKE_CURRENT_LIST_DIR where appropriate.
Stephen Kelly [Fri, 15 Mar 2013 17:25:09 +0000 (18:25 +0100)]
Use CMAKE_CURRENT_LIST_DIR where appropriate.

4 years agoUse the CMAKE_AUTOMOC feature in Grantlee.
Stephen Kelly [Fri, 15 Mar 2013 17:21:52 +0000 (18:21 +0100)]
Use the CMAKE_AUTOMOC feature in Grantlee.

4 years agoUse CMakeParseArguments from upstream.
Stephen Kelly [Fri, 15 Mar 2013 17:17:08 +0000 (18:17 +0100)]
Use CMakeParseArguments from upstream.

Remove the Grantlee fork of it.

4 years agoUse GenerateExportHeader from CMake upstream.
Stephen Kelly [Fri, 15 Mar 2013 17:16:05 +0000 (18:16 +0100)]
Use GenerateExportHeader from CMake upstream.

Remove the Grantlee fork of it.

4 years agoBump Grantlee CMake requirement to 2.8.9.
Stephen Kelly [Fri, 15 Mar 2013 17:14:24 +0000 (18:14 +0100)]
Bump Grantlee CMake requirement to 2.8.9.

This will allow many cleanups.

4 years agoFind qtestlib only where it is needed.
Stephen Kelly [Thu, 14 Mar 2013 19:53:25 +0000 (20:53 +0100)]
Find qtestlib only where it is needed.

Fixes https://bugs.gentoo.org/show_bug.cgi?id=409131

4 years agoBump version.
Stephen Kelly [Thu, 14 Mar 2013 19:56:09 +0000 (20:56 +0100)]
Bump version.

5 years agoBump the version for the next release. v0.3.0
Stephen Kelly [Thu, 1 Nov 2012 20:14:18 +0000 (21:14 +0100)]
Bump the version for the next release.

5 years agoAdd new line after a list item.
Montel Laurent [Fri, 19 Oct 2012 10:40:41 +0000 (12:40 +0200)]
Add new line after a list item.

Don't add it when list item is empty string

5 years agoAdd support for roman style
Montel Laurent [Fri, 19 Oct 2012 09:44:16 +0000 (11:44 +0200)]
Add support for roman style

5 years agoRemove unused variables.
Stephen Kelly [Sat, 20 Oct 2012 06:45:27 +0000 (08:45 +0200)]
Remove unused variables.

5 years agoFix some includes.
Stephen Kelly [Sun, 12 Aug 2012 14:04:08 +0000 (16:04 +0200)]
Fix some includes.

5 years agoUse a QVector of filters instead of a QList.
Stephen Kelly [Mon, 26 Dec 2011 23:33:57 +0000 (00:33 +0100)]
Use a QVector of filters instead of a QList.

5 years agoAssert on the required internal type in a cycle tag.
Stephen Kelly [Mon, 26 Dec 2011 23:29:15 +0000 (00:29 +0100)]
Assert on the required internal type in a cycle tag.

5 years agoTest the null localizer plural behaviour.
Stephen Kelly [Mon, 26 Dec 2011 23:27:37 +0000 (00:27 +0100)]
Test the null localizer plural behaviour.

5 years agoTest the population of the externalMedia context container.
Stephen Kelly [Mon, 26 Dec 2011 23:26:45 +0000 (00:26 +0100)]
Test the population of the externalMedia context container.

5 years agoTest MetaEnumVariable default ctor.
Stephen Kelly [Mon, 26 Dec 2011 23:26:14 +0000 (00:26 +0100)]
Test MetaEnumVariable default ctor.