Skip to content
Permalink
Browse files

Merge branch 'styles_to_db' of https://github.com/el1073/Quantum-GIS

…into styles_to_db

Conflicts:
	src/core/qgsvectordataprovider.h
  • Loading branch information
Emilio Loi
Emilio Loi committed Apr 30, 2013
2 parents f344e51 + 8a6cba6 commit d6b3bfaafae19dcaed32eebdb00ae1d40caa8bed
Showing with 11 additions and 0 deletions.
  1. +11 −0 src/core/qgsvectordataprovider.h
@@ -328,6 +328,11 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
QStringList errors();

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a6cba64ec5ef59a35d60403c495bf1075514216
/**
* It returns false by default.
* Must be implemented by providers that support saving and loading styles to db returning true
@@ -340,6 +345,12 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider

/** Is emitted, when editing stopped */
void editingStopped();
<<<<<<< HEAD
=======
>>>>>>> f3842775a5147b7a8da1639a4bec667a769b7fac
=======
>>>>>>> 009ba1b995536ad9936991524ccd0f53a1a5b558
>>>>>>> 8a6cba64ec5ef59a35d60403c495bf1075514216

protected:
QVariant convertValue( QVariant::Type type, QString value );

0 comments on commit d6b3bfa

Please sign in to comment.
You can’t perform that action at this time.