aboutsummaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-02-12 15:32:08 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-02-12 19:45:45 +0000
commitb6ff963362955f63ca35daa0268d8fde93229997 (patch)
tree764b3b8d6e9e3407ea6f7e5b6af1b005f9308ded /src/src.pro
parent707e6f528fc79db236d282e7ea41eb952c825433 (diff)
Revert "Build (and fail) Quick with -no-opengl"
This reverts commit 707e6f528fc79db236d282e7ea41eb952c825433. We will not pursue this route for the time being. Change-Id: Idd1fce362440f6bf1b58901a289843fdfb39a5b7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/src.pro b/src/src.pro
index f34e9cda9f..385e4eb601 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,17 +3,13 @@ CONFIG += ordered
SUBDIRS += \
qml
-qtHaveModule(gui) {
+qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
SUBDIRS += \
- quick
+ quick \
+ qmltest \
+ particles
- contains(QT_CONFIG, opengl(es1|es2)?) {
- SUBDIRS += \
- qmltest \
- particles
-
- qtHaveModule(widgets): SUBDIRS += quickwidgets
- }
+ qtHaveModule(widgets): SUBDIRS += quickwidgets
}
SUBDIRS += \