← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qt3d-opensource-src/vivid-proposed

« back to all changes in this revision

Viewing changes to src/threed/effects/qglcolladafxeffectfactory.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2013-08-02 11:10:16 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130802111016-r3cjsz79ulbawpgv
Tags: 5.0~git20130731-0ubuntu1
* New upstream snapshot release
* Improve override_dh_auto_install, use --fail-missing
* Drop patches:
  - add_GPL_license_file.patch, merged upstream
  - add_module_version.patch, added upstream
  - disable_conflicting_examples.patch, not needed anymore
* Refresh link_against_system_zlib.patch
* Add bug link to workaround_zlib_linking_issue.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/threed/effects/qglcolladafxeffectfactory.h
49
49
#include <QXmlStreamReader>
50
50
#include <QDir>
51
51
 
52
 
QT_BEGIN_HEADER
53
 
 
54
52
Q_DECLARE_METATYPE(QArray<float>)
55
53
 
56
54
QT_BEGIN_NAMESPACE
89
87
    static QGLColladaFxEffect* processTechniqueElement( QXmlStreamReader& xml, ResultState* stateStack, QString &profileName );
90
88
    static QGLColladaParam* processNewparamElement( QXmlStreamReader& xml, ResultState* stateStack );
91
89
    static void processImageElement( QXmlStreamReader& xml, ResultState* stateStack );
92
 
    static QGLColladaSurfaceParam* processSurfaceElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid = "");
 
90
    static QGLColladaSurfaceParam* processSurfaceElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid = QString());
93
91
    static void processSampler2DElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid );
94
92
    static QGLTexture2D* processTextureElement( QXmlStreamReader& xml , ResultState* stateStack );
95
93
    static QVariant processFloatList( QXmlStreamReader& xml );
216
214
 
217
215
QT_END_NAMESPACE
218
216
 
219
 
QT_END_HEADER
220
 
 
221
217
#endif // QGLCOLLADAFXEFFECTFACTORY_H