~ubuntu-branches/ubuntu/saucy/caret/saucy-proposed

« back to all changes in this revision

Viewing changes to caret_qmake_include.pro

  • Committer: Package Import Robot
  • Author(s): Michael Bienia
  • Date: 2012-09-26 11:59:25 UTC
  • mfrom: (4.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120926115925-7ddgvuvc10g6vjnt
Tags: 5.6.4~dfsg.1-3ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Build-depend on libqwt-dev instead of libqwt5-qt4-dev as part of qwt6
    transition
  - Add debian/patches/qwt6-linking and update no_undefineds to fix link
    target for qwt6

Show diffs side-by-side

added added

removed removed

Lines of Context:
269
269
            -lvtkCommon \
270
270
            -lvtksys
271
271
        
272
 
    LIBS += -lpng
 
272
    LIBS += -lpng -lGLU
273
273
    contains (DEFINES, HAVE_QWT) {
274
274
       QWT_LIBS = -L$$(QWT_LIB_DIR) -lqwt
275
275
    }