diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-02 12:22:47 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-02 12:22:47 +0200 |
| commit | 746e2a54cb9e78efc8995886f2de1d429b74fdec (patch) | |
| tree | f6641b2992540d886b5cb4b7879b30e737c2a3aa /src/lib/corelib/api | |
| parent | 0d17c9617e1478951ea8e967937adb7d16a8e3b3 (diff) | |
| parent | b300372f7e6bb106e8b77adebaa40bfbfebebd3a (diff) | |
Merge remote-tracking branch 'origin/1.2'
Conflicts:
qbs_version.pri
share/qbs/modules/cpp/GenericGCC.qbs
version.js
Change-Id: I77e3d22cdc6f95bfa83c64a7fcfde735c6393d10
Diffstat (limited to 'src/lib/corelib/api')
| -rw-r--r-- | src/lib/corelib/api/api.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/corelib/api/api.pri b/src/lib/corelib/api/api.pri index e1cc31a36..2259face1 100644 --- a/src/lib/corelib/api/api.pri +++ b/src/lib/corelib/api/api.pri @@ -23,7 +23,12 @@ SOURCES += \ $$PWD/qmljsrewriter.cpp !qbs_no_dev_install { - api_headers.files = $$PWD/projectdata.h $$PWD/runenvironment.h $$PWD/jobs.h $$PWD/project.h + api_headers.files = \ + $$PWD/jobs.h \ + $$PWD/languageinfo.h \ + $$PWD/project.h \ + $$PWD/projectdata.h \ + $$PWD/runenvironment.h api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api INSTALLS += api_headers } |