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/corelib.qbs | |
| 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/corelib.qbs')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index a7214f306..697c764c6 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -37,7 +37,6 @@ QbsLibrary { "internaljobs.h", "jobs.cpp", "languageinfo.cpp", - "languageinfo.h", "project.cpp", "projectdata.cpp", "projectdata_p.h", @@ -56,6 +55,7 @@ QbsLibrary { prefix: "api/" files: [ "jobs.h", + "languageinfo.h", "project.h", "projectdata.h", "runenvironment.h" |