diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-25 14:11:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 19:49:44 +0200 |
| commit | 9ab41425519510b5bfbe93ac916e3f40aa0e4510 (patch) | |
| tree | fa743adfb429410b857778eab863b3d496fff26d /src/angle/src/config.pri | |
| parent | 485b7424df5cb3474cc802bced77770d85bdcb37 (diff) | |
centralize auxiliary lib creation
this covers convenience libraries which are linked into dlls (if we are
not building statically) and "proper" (installed) builds of 3rdparty
code.
Change-Id: I2f00248c0baa0e73346e477724bf49bbc62ba925
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/angle/src/config.pri')
| -rw-r--r-- | src/angle/src/config.pri | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 8e0f6b7f42..aa777c356f 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -59,17 +59,10 @@ CONFIG(debug, debug|release) { } # c++11 is needed by MinGW to get support for unordered_map. -CONFIG -= qt CONFIG += stl exceptions c++11 -contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release -contains(QT_CONFIG, build_all):CONFIG += build_all - INCLUDEPATH += . .. $$PWD/../include -DESTDIR = $$QT_BUILD_TREE/lib -DLLDESTDIR = $$QT_BUILD_TREE/bin - msvc { # Disabled Warnings: # 4100: 'identifier' : unreferenced formal parameter @@ -107,3 +100,5 @@ gcc { QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE + +load(qt_helper_lib) |