diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-15 14:01:15 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-11-16 12:05:26 +0000 |
| commit | 38e935701c0faeb19b9b1493dc2d6d60c6bc3ca3 (patch) | |
| tree | a8ee9b2f6fdf5cda41ede22b3c00445bc03562cc /mkspecs | |
| parent | a6fbfea24a26d6dc4237eb5fcb9ab4298a612732 (diff) | |
make QMAKE_USE obey QMAKE_LIBDIR_*
this is complementary to configure's makeSpec library source type.
this should be sufficient to make QMAKE_USE += {egl,opengl,opengl_es2}
actually work, obsoleting the need for opengl.prf and egl.prf (and the
currently dysfunct openvg.prf).
Change-Id: I2f7595ac89afa087ea7f0f25060e8e47e6148be9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qmake_use.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf index 81b841d457..9b6c67ccc2 100644 --- a/mkspecs/features/qmake_use.prf +++ b/mkspecs/features/qmake_use.prf @@ -10,14 +10,17 @@ for(ever) { else: \ libs = $$eval(QMAKE_LIBS_$${nu}_RELEASE) libs += $$eval(QMAKE_LIBS_$$nu) + libdir = $$eval(QMAKE_LIBDIR_$$nu) defines = $$eval(QMAKE_DEFINES_$${nu}) includes = $$eval(QMAKE_INCDIR_$${nu}) isEmpty(libs):isEmpty(defines):isEmpty(includes): \ error("Library '$$name' is not defined.") - !contains(use, nolink): \ + !contains(use, nolink) { + QMAKE_LIBDIR += $$libdir LIBS$${suffix} += $$libs + } !contains(use, linkonly) { DEFINES += $$defines INCLUDEPATH += $$includes |