← Back to branch summary

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

« back to all changes in this revision

Viewing changes to qt3d.pro

  • 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:
qt3d.pro
 
1
requires(qtHaveModule(opengl))
 
2
 
1
3
load(qt_parts)
2
4
 
3
5
module_qt3d_tutorials.subdir = tutorials
11
13
 
12
14
gcov: SUBDIRS -= sub_tools
13
15
 
14
 
# We need opengl, minimum es2 or desktop
15
 
!contains(QT_CONFIG, opengl) {
16
 
    error(Qt3D requires OpenGL!)
17
 
}
 
16
# We need opengl, minimum es2
18
17
contains(QT_CONFIG, opengles1) {
19
 
    error(Qt3D does not support OpenGL ES 1!)
 
18
    error("Qt3D does not support OpenGL ES 1!")
20
19
}