diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /mkspecs/features/opengles1.prf | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'mkspecs/features/opengles1.prf')
-rw-r--r-- | mkspecs/features/opengles1.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/opengles1.prf b/mkspecs/features/opengles1.prf new file mode 100644 index 0000000000..b09262f8a9 --- /dev/null +++ b/mkspecs/features/opengles1.prf @@ -0,0 +1,2 @@ +QMAKE_LIBS_OPENGL_ES2 = +LIBS += $$QMAKE_LIBS_OPENGL_ES1 |