diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:54 +0200 |
| commit | a5ca4a64ac54a2bc67421a74d2caf5f085d26861 (patch) | |
| tree | 54b867facb4601a5597336f08f1c999c02087e9d | |
| parent | 5795eaf936ca43306c3bcaf53cf943de01fa796f (diff) | |
| parent | ed11da0e216c84c4950f57cf9d9d262221050d4f (diff) | |
| download | qtsvg-a5ca4a64ac54a2bc67421a74d2caf5f085d26861.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I6036f0aa9166f6e7f57192ae92fb2c1322df3845
| -rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 | ||||
| -rw-r--r-- | examples/svg/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro index 45f3f19..dd3211f 100644 --- a/examples/svg/opengl/framebufferobject/framebufferobject.pro +++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro @@ -1,3 +1,5 @@ +contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x") + QT += widgets opengl svg HEADERS += glwidget.h diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro index 9ebf5ed..723efad 100644 --- a/examples/svg/opengl/opengl.pro +++ b/examples/svg/opengl/opengl.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS += framebufferobject +qtHaveModule(widgets):!contains(QT_CONFIG, opengles2): SUBDIRS += framebufferobject diff --git a/sync.profile b/sync.profile index f0fe925..e7d8f15 100644 --- a/sync.profile +++ b/sync.profile @@ -8,7 +8,8 @@ # Each of the module version specifiers can take one of the following values: # - A specific Git revision. # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/dev", + "qtbase" => "", ); |