diff options
| author | Albert Astals Cid <aacid@kde.org> | 2012-09-25 23:22:23 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2012-09-25 23:22:23 +0200 |
| commit | b97c28c42a18d1c2a8fabea52c092d948811d582 (patch) | |
| tree | 1a8e34d2c9609ba0e6ab9d40a5bed69484acf7fc /qt4 | |
| parent | 32bb87419c360a3b14c717c0f385198b70a1b2e7 (diff) | |
| parent | f8c116f1e0fbf3516ce228fbb34c33d6b618bed0 (diff) | |
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
qt4/src/Makefile.am
Diffstat (limited to 'qt4')
| -rw-r--r-- | qt4/src/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index 745db97c..b91daf0f 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -1,7 +1,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ - $(POPPLER_QT4_CFLAGS) + $(POPPLER_QT4_CFLAGS) \ + $(LCMS_CFLAGS) SUFFIXES: .moc |