diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:18:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:56:41 +0200 |
| commit | e6286ca289db11463d13ec4d31055995b32ad258 (patch) | |
| tree | 944bd3a2e93691bdd977ef7818b8241c1193d888 /src/angle/src/compiler/preprocessor/preprocessor.pro | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
| parent | 9ae89313e43689483282ac330ad189db89bfcbba (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'src/angle/src/compiler/preprocessor/preprocessor.pro')
| -rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index 74cd97c5a4..420cb90b36 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -1,7 +1,4 @@ -TEMPLATE = lib CONFIG += static -TARGET = $$qtLibraryTarget(preprocessor) - include(../../config.pri) INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor |