Move Qt profile setup into a dedicated library.

Otherwise all changes to the implementation will have to be duplicated
in IDEs.

Change-Id: I61e6d4fa1ee9b724eb5d9de9f233dc915a6c8bc3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

315 files changed, 211 insertions, 93 deletions

diff --git a/qbs.pro b/qbs.pro
index 0661203c3..f2b204db5 100644
--- a/qbs.pro
+++ b/qbs.pro
@@ -28,11 +28,14 @@ defineTest(minQtVersion) {
 
 TEMPLATE = subdirs
 CONFIG += ordered
-lib.file = src/lib/lib.pro
+corelib.file = src/lib/corelib/corelib.pro
+setupqtprofilelib.subdir = src/lib/qtprofilesetup
+setupqtprofilelib.depends = corelib
 src_app.subdir = src/app
-src_app.depends = lib
+src_app.depends = setupqtprofilelib
 SUBDIRS += \
-    lib\
+    corelib\
+    setupqtprofilelib\
     src_app\
     src/plugins\
     static.pro\
diff --git a/src/app/app.pri b/src/app/app.pri
index 1fb804af7..8dc6dc95b 100644
--- a/src/app/app.pri
+++ b/src/app/app.pri
@@ -5,7 +5,7 @@ DESTDIR = ../../../bin
 CONFIG += console
 CONFIG -= app_bundle
 
-include($${PWD}/../lib/use.pri)
+include($${PWD}/../lib/corelib/use_corelib.pri)
 include($${PWD}/shared/logging/logging.pri)
 
 target.path = $${QBS_INSTALL_PREFIX}/bin
diff --git a/src/app/qbs-setup-qt/main.cpp b/src/app/qbs-setup-qt/main.cpp
index 1376a7a70..54fa6739a 100644
--- a/src/app/qbs-setup-qt/main.cpp
+++ b/src/app/qbs-setup-qt/main.cpp
@@ -31,6 +31,7 @@
 #include "../shared/logging/consolelogger.h"
 #include "../shared/qbssettings.h"
 
+#include <qtprofilesetup.h>
 #include <logging/translator.h>
 
 #include <QCoreApplication>
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.pro b/src/app/qbs-setup-qt/qbs-setup-qt.pro
index 4840b7ea0..3f2cb8e06 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.pro
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.pro
@@ -1,13 +1,12 @@
 include(../app.pri)
+include($${PWD}/../../lib/qtprofilesetup/use_qtprofilesetup.pri)
 
 TARGET = qbs-setup-qt
 
 SOURCES += \
     main.cpp \
-    setupqt.cpp \
-    setupqtprofile.cpp
+    setupqt.cpp
 
 HEADERS += \
     setupqt.h \
-    setupqtprofile.h \
     ../shared/qbssettings.h
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index c3d2f647f..35de5aa7f 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -3,13 +3,12 @@ import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     name: "qbs-setup-qt"
+    Depends { name: "qbsqtprofilesetup" }
     files: [
         "../shared/qbssettings.h",
         "main.cpp",
         "setupqt.cpp",
-        "setupqt.h",
-        "setupqtprofile.cpp",
-        "setupqtprofile.h",
+        "setupqt.h"
     ]
 }
 
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index 205f21e21..1ee3cb8b2 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -29,8 +29,8 @@
 
 #include "setupqt.h"
 
-#include "setupqtprofile.h"
 #include "../shared/logging/consolelogger.h"
+#include <qtprofilesetup.h>
 #include <logging/translator.h>
 #include <tools/hostosinfo.h>
 #include <tools/profile.h>
diff --git a/src/app/qbs-setup-qt/setupqt.h b/src/app/qbs-setup-qt/setupqt.h
index 831d97956..94d3074d9 100644
--- a/src/app/qbs-setup-qt/setupqt.h
+++ b/src/app/qbs-setup-qt/setupqt.h
@@ -30,13 +30,12 @@
 #ifndef QBS_SETUPQT_H
 #define QBS_SETUPQT_H
 
-#include "setupqtprofile.h"
-
 #include <tools/error.h>
 #include <QCoreApplication>
 #include <QStringList>
 
 namespace qbs {
+class QtEnvironment;
 class Settings;
 
 class SetupQt
diff --git a/src/lib/Library.qbs b/src/lib/Library.qbs
new file mode 100644
index 000000000..12809460f
--- /dev/null
+++ b/src/lib/Library.qbs
@@ -0,0 +1,27 @@
+import qbs
+import "../../version.js" as Version
+
+Product {
+    Depends { name: "cpp" }
+    Depends { name: "Qt"; submodules: ["core"] }
+    version: Version.qbsVersion()
+    type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary"
+    targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name
+    destinationDirectory: qbs.targetOS.contains("windows") ? "bin" : "lib"
+    cpp.treatWarningsAsErrors: true
+    cpp.defines: base.concat(type == "staticlibrary" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"])
+    cpp.installNamePrefix: "@rpath/"
+    property string headerInstallPrefix: "/include/qbs"
+    Group {
+        fileTagsFilter: product.type.concat("dynamiclibrary_symlink")
+        qbs.install: true
+        qbs.installDir: project.libInstallDir
+    }
+    Export {
+        Depends { name: "cpp" }
+        Depends { name: "Qt"; submodules: ["core"] }
+        cpp.rpaths: project.libRPaths
+        cpp.includePaths: "."
+        cpp.defines: product.type === "staticlibrary" ? ["QBS_STATIC_LIB"] : []
+    }
+}
diff --git a/src/lib/api/api.pri b/src/lib/corelib/api/api.pri
index 8a0c93237..8a0c93237 100644
--- a/src/lib/api/api.pri
+++ b/src/lib/corelib/api/api.pri
diff --git a/src/lib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp
index bbde289a6..bbde289a6 100644
--- a/src/lib/api/changeset.cpp
+++ b/src/lib/corelib/api/changeset.cpp
diff --git a/src/lib/api/changeset.h b/src/lib/corelib/api/changeset.h
index b1674d392..b1674d392 100644
--- a/src/lib/api/changeset.h
+++ b/src/lib/corelib/api/changeset.h
diff --git a/src/lib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index a28bee72e..a28bee72e 100644
--- a/src/lib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
diff --git a/src/lib/api/internaljobs.h b/src/lib/corelib/api/internaljobs.h
index ef112662f..ef112662f 100644
--- a/src/lib/api/internaljobs.h
+++ b/src/lib/corelib/api/internaljobs.h
diff --git a/src/lib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp
index d7ac324cb..d7ac324cb 100644
--- a/src/lib/api/jobs.cpp
+++ b/src/lib/corelib/api/jobs.cpp
diff --git a/src/lib/api/jobs.h b/src/lib/corelib/api/jobs.h
index 42c743876..42c743876 100644
--- a/src/lib/api/jobs.h
+++ b/src/lib/corelib/api/jobs.h
diff --git a/src/lib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 6826884e6..6826884e6 100644
--- a/src/lib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
diff --git a/src/lib/api/project.h b/src/lib/corelib/api/project.h
index 0118977c5..0118977c5 100644
--- a/src/lib/api/project.h
+++ b/src/lib/corelib/api/project.h
diff --git a/src/lib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index a5cc6093e..a5cc6093e 100644
--- a/src/lib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
diff --git a/src/lib/api/projectdata.h b/src/lib/corelib/api/projectdata.h
index ba0016d0c..ba0016d0c 100644
--- a/src/lib/api/projectdata.h
+++ b/src/lib/corelib/api/projectdata.h
diff --git a/src/lib/api/projectdata_p.h b/src/lib/corelib/api/projectdata_p.h
index 2eda4d932..2eda4d932 100644
--- a/src/lib/api/projectdata_p.h
+++ b/src/lib/corelib/api/projectdata_p.h
diff --git a/src/lib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index e7d879b28..e7d879b28 100644
--- a/src/lib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
diff --git a/src/lib/api/projectfileupdater.h b/src/lib/corelib/api/projectfileupdater.h
index ba125dc41..ba125dc41 100644
--- a/src/lib/api/projectfileupdater.h
+++ b/src/lib/corelib/api/projectfileupdater.h
diff --git a/src/lib/api/propertymap_p.h b/src/lib/corelib/api/propertymap_p.h
index e57e323cc..e57e323cc 100644
--- a/src/lib/api/propertymap_p.h
+++ b/src/lib/corelib/api/propertymap_p.h
diff --git a/src/lib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp
index ecb59e778..ecb59e778 100644
--- a/src/lib/api/qmljsrewriter.cpp
+++ b/src/lib/corelib/api/qmljsrewriter.cpp
diff --git a/src/lib/api/qmljsrewriter.h b/src/lib/corelib/api/qmljsrewriter.h
index 09a638ab0..09a638ab0 100644
--- a/src/lib/api/qmljsrewriter.h
+++ b/src/lib/corelib/api/qmljsrewriter.h
diff --git a/src/lib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index 43b5c5605..43b5c5605 100644
--- a/src/lib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
diff --git a/src/lib/api/runenvironment.h b/src/lib/corelib/api/runenvironment.h
index 18ca65aae..18ca65aae 100644
--- a/src/lib/api/runenvironment.h
+++ b/src/lib/corelib/api/runenvironment.h
diff --git a/src/lib/buildgraph/abstractcommandexecutor.cpp b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
index fa419a734..fa419a734 100644
--- a/src/lib/buildgraph/abstractcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
diff --git a/src/lib/buildgraph/abstractcommandexecutor.h b/src/lib/corelib/buildgraph/abstractcommandexecutor.h
index 0abb5c137..0abb5c137 100644
--- a/src/lib/buildgraph/abstractcommandexecutor.h
+++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.h
diff --git a/src/lib/buildgraph/artifact.cpp b/src/lib/corelib/buildgraph/artifact.cpp
index 73a102827..73a102827 100644
--- a/src/lib/buildgraph/artifact.cpp
+++ b/src/lib/corelib/buildgraph/artifact.cpp
diff --git a/src/lib/buildgraph/artifact.h b/src/lib/corelib/buildgraph/artifact.h
index b2e9b0703..b2e9b0703 100644
--- a/src/lib/buildgraph/artifact.h
+++ b/src/lib/corelib/buildgraph/artifact.h
diff --git a/src/lib/buildgraph/artifactcleaner.cpp b/src/lib/corelib/buildgraph/artifactcleaner.cpp
index 98fed728e..98fed728e 100644
--- a/src/lib/buildgraph/artifactcleaner.cpp
+++ b/src/lib/corelib/buildgraph/artifactcleaner.cpp
diff --git a/src/lib/buildgraph/artifactcleaner.h b/src/lib/corelib/buildgraph/artifactcleaner.h
index 760af3412..760af3412 100644
--- a/src/lib/buildgraph/artifactcleaner.h
+++ b/src/lib/corelib/buildgraph/artifactcleaner.h
diff --git a/src/lib/buildgraph/artifactlist.cpp b/src/lib/corelib/buildgraph/artifactlist.cpp
index b435e3e60..b435e3e60 100644
--- a/src/lib/buildgraph/artifactlist.cpp
+++ b/src/lib/corelib/buildgraph/artifactlist.cpp
diff --git a/src/lib/buildgraph/artifactlist.h b/src/lib/corelib/buildgraph/artifactlist.h
index bbe2771cb..bbe2771cb 100644
--- a/src/lib/buildgraph/artifactlist.h
+++ b/src/lib/corelib/buildgraph/artifactlist.h
diff --git a/src/lib/buildgraph/artifactvisitor.cpp b/src/lib/corelib/buildgraph/artifactvisitor.cpp
index 3b5203e26..3b5203e26 100644
--- a/src/lib/buildgraph/artifactvisitor.cpp
+++ b/src/lib/corelib/buildgraph/artifactvisitor.cpp
diff --git a/src/lib/buildgraph/artifactvisitor.h b/src/lib/corelib/buildgraph/artifactvisitor.h
index 0c113ea1b..0c113ea1b 100644
--- a/src/lib/buildgraph/artifactvisitor.h
+++ b/src/lib/corelib/buildgraph/artifactvisitor.h
diff --git a/src/lib/buildgraph/automoc.cpp b/src/lib/corelib/buildgraph/automoc.cpp
index 5dcb6ec9f..5dcb6ec9f 100644
--- a/src/lib/buildgraph/automoc.cpp
+++ b/src/lib/corelib/buildgraph/automoc.cpp
diff --git a/src/lib/buildgraph/automoc.h b/src/lib/corelib/buildgraph/automoc.h
index d57fc292e..d57fc292e 100644
--- a/src/lib/buildgraph/automoc.h
+++ b/src/lib/corelib/buildgraph/automoc.h
diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index 5284de5a9..5284de5a9 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
diff --git a/src/lib/buildgraph/buildgraph.h b/src/lib/corelib/buildgraph/buildgraph.h
index 5244894cb..5244894cb 100644
--- a/src/lib/buildgraph/buildgraph.h
+++ b/src/lib/corelib/buildgraph/buildgraph.h
diff --git a/src/lib/buildgraph/buildgraph.pri b/src/lib/corelib/buildgraph/buildgraph.pri
index fa091f1b3..fa091f1b3 100644
--- a/src/lib/buildgraph/buildgraph.pri
+++ b/src/lib/corelib/buildgraph/buildgraph.pri
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index b76b33eb6..b76b33eb6 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
diff --git a/src/lib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h
index f7f7b79e3..f7f7b79e3 100644
--- a/src/lib/buildgraph/buildgraphloader.h
+++ b/src/lib/corelib/buildgraph/buildgraphloader.h
diff --git a/src/lib/buildgraph/command.cpp b/src/lib/corelib/buildgraph/command.cpp
index 8e30906ee..8e30906ee 100644
--- a/src/lib/buildgraph/command.cpp
+++ b/src/lib/corelib/buildgraph/command.cpp
diff --git a/src/lib/buildgraph/command.h b/src/lib/corelib/buildgraph/command.h
index 69fa32299..69fa32299 100644
--- a/src/lib/buildgraph/command.h
+++ b/src/lib/corelib/buildgraph/command.h
diff --git a/src/lib/buildgraph/cycledetector.cpp b/src/lib/corelib/buildgraph/cycledetector.cpp
index 1ab6b4bb8..1ab6b4bb8 100644
--- a/src/lib/buildgraph/cycledetector.cpp
+++ b/src/lib/corelib/buildgraph/cycledetector.cpp
diff --git a/src/lib/buildgraph/cycledetector.h b/src/lib/corelib/buildgraph/cycledetector.h
index 6e55efac3..6e55efac3 100644
--- a/src/lib/buildgraph/cycledetector.h
+++ b/src/lib/corelib/buildgraph/cycledetector.h
diff --git a/src/lib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index c1f7c6af3..c1f7c6af3 100644
--- a/src/lib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
diff --git a/src/lib/buildgraph/executor.h b/src/lib/corelib/buildgraph/executor.h
index ece3b39a3..ece3b39a3 100644
--- a/src/lib/buildgraph/executor.h
+++ b/src/lib/corelib/buildgraph/executor.h
diff --git a/src/lib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp
index 3ad3df6d5..3ad3df6d5 100644
--- a/src/lib/buildgraph/executorjob.cpp
+++ b/src/lib/corelib/buildgraph/executorjob.cpp
diff --git a/src/lib/buildgraph/executorjob.h b/src/lib/corelib/buildgraph/executorjob.h
index fcd06cc6d..fcd06cc6d 100644
--- a/src/lib/buildgraph/executorjob.h
+++ b/src/lib/corelib/buildgraph/executorjob.h
diff --git a/src/lib/buildgraph/filedependency.cpp b/src/lib/corelib/buildgraph/filedependency.cpp
index 8341de050..8341de050 100644
--- a/src/lib/buildgraph/filedependency.cpp
+++ b/src/lib/corelib/buildgraph/filedependency.cpp
diff --git a/src/lib/buildgraph/filedependency.h b/src/lib/corelib/buildgraph/filedependency.h
index 0379c0ec6..0379c0ec6 100644
--- a/src/lib/buildgraph/filedependency.h
+++ b/src/lib/corelib/buildgraph/filedependency.h
diff --git a/src/lib/buildgraph/forward_decls.h b/src/lib/corelib/buildgraph/forward_decls.h
index 7f3986a9b..7f3986a9b 100644
--- a/src/lib/buildgraph/forward_decls.h
+++ b/src/lib/corelib/buildgraph/forward_decls.h
diff --git a/src/lib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index d5a0fabb6..d5a0fabb6 100644
--- a/src/lib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
diff --git a/src/lib/buildgraph/inputartifactscanner.h b/src/lib/corelib/buildgraph/inputartifactscanner.h
index 234d25d83..234d25d83 100644
--- a/src/lib/buildgraph/inputartifactscanner.h
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.h
diff --git a/src/lib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
index ef84da432..ef84da432 100644
--- a/src/lib/buildgraph/jscommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
diff --git a/src/lib/buildgraph/jscommandexecutor.h b/src/lib/corelib/buildgraph/jscommandexecutor.h
index 94a25e610..94a25e610 100644
--- a/src/lib/buildgraph/jscommandexecutor.h
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.h
diff --git a/src/lib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index 8887cc99f..8887cc99f 100644
--- a/src/lib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
diff --git a/src/lib/buildgraph/processcommandexecutor.h b/src/lib/corelib/buildgraph/processcommandexecutor.h
index c90141303..c90141303 100644
--- a/src/lib/buildgraph/processcommandexecutor.h
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.h
diff --git a/src/lib/buildgraph/productbuilddata.cpp b/src/lib/corelib/buildgraph/productbuilddata.cpp
index 0b9f36ab1..0b9f36ab1 100644
--- a/src/lib/buildgraph/productbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/productbuilddata.cpp
diff --git a/src/lib/buildgraph/productbuilddata.h b/src/lib/corelib/buildgraph/productbuilddata.h
index 15c8cc78f..15c8cc78f 100644
--- a/src/lib/buildgraph/productbuilddata.h
+++ b/src/lib/corelib/buildgraph/productbuilddata.h
diff --git a/src/lib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index 867ad1370..867ad1370 100644
--- a/src/lib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
diff --git a/src/lib/buildgraph/productinstaller.h b/src/lib/corelib/buildgraph/productinstaller.h
index 3f970b6aa..3f970b6aa 100644
--- a/src/lib/buildgraph/productinstaller.h
+++ b/src/lib/corelib/buildgraph/productinstaller.h
diff --git a/src/lib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 1ba53abf2..1ba53abf2 100644
--- a/src/lib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
diff --git a/src/lib/buildgraph/projectbuilddata.h b/src/lib/corelib/buildgraph/projectbuilddata.h
index 515d5f00e..515d5f00e 100644
--- a/src/lib/buildgraph/projectbuilddata.h
+++ b/src/lib/corelib/buildgraph/projectbuilddata.h
diff --git a/src/lib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp
index b59edaaba..b59edaaba 100644
--- a/src/lib/buildgraph/rulegraph.cpp
+++ b/src/lib/corelib/buildgraph/rulegraph.cpp
diff --git a/src/lib/buildgraph/rulegraph.h b/src/lib/corelib/buildgraph/rulegraph.h
index 2f9a42a33..2f9a42a33 100644
--- a/src/lib/buildgraph/rulegraph.h
+++ b/src/lib/corelib/buildgraph/rulegraph.h
diff --git a/src/lib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index 8aea1f916..8aea1f916 100644
--- a/src/lib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
diff --git a/src/lib/buildgraph/rulesapplicator.h b/src/lib/corelib/buildgraph/rulesapplicator.h
index 76664baac..76664baac 100644
--- a/src/lib/buildgraph/rulesapplicator.h
+++ b/src/lib/corelib/buildgraph/rulesapplicator.h
diff --git a/src/lib/buildgraph/rulesevaluationcontext.cpp b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
index 5cabea9d7..5cabea9d7 100644
--- a/src/lib/buildgraph/rulesevaluationcontext.cpp
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
diff --git a/src/lib/buildgraph/rulesevaluationcontext.h b/src/lib/corelib/buildgraph/rulesevaluationcontext.h
index 1682e858b..1682e858b 100644
--- a/src/lib/buildgraph/rulesevaluationcontext.h
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.h
diff --git a/src/lib/buildgraph/scanresultcache.cpp b/src/lib/corelib/buildgraph/scanresultcache.cpp
index 98cfb7fba..98cfb7fba 100644
--- a/src/lib/buildgraph/scanresultcache.cpp
+++ b/src/lib/corelib/buildgraph/scanresultcache.cpp
diff --git a/src/lib/buildgraph/scanresultcache.h b/src/lib/corelib/buildgraph/scanresultcache.h
index 289aa31e6..289aa31e6 100644
--- a/src/lib/buildgraph/scanresultcache.h
+++ b/src/lib/corelib/buildgraph/scanresultcache.h
diff --git a/src/lib/buildgraph/timestampsupdater.cpp b/src/lib/corelib/buildgraph/timestampsupdater.cpp
index c22e9f96c..c22e9f96c 100644
--- a/src/lib/buildgraph/timestampsupdater.cpp
+++ b/src/lib/corelib/buildgraph/timestampsupdater.cpp
diff --git a/src/lib/buildgraph/timestampsupdater.h b/src/lib/corelib/buildgraph/timestampsupdater.h
index c1f918837..c1f918837 100644
--- a/src/lib/buildgraph/timestampsupdater.h
+++ b/src/lib/corelib/buildgraph/timestampsupdater.h
diff --git a/src/lib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 5c095f9db..5c095f9db 100644
--- a/src/lib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
diff --git a/src/lib/buildgraph/transformer.h b/src/lib/corelib/buildgraph/transformer.h
index b6ef09561..b6ef09561 100644
--- a/src/lib/buildgraph/transformer.h
+++ b/src/lib/corelib/buildgraph/transformer.h
diff --git a/src/lib/buildgraph/tst_buildgraph.cpp b/src/lib/corelib/buildgraph/tst_buildgraph.cpp
index a159c2938..a159c2938 100644
--- a/src/lib/buildgraph/tst_buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/tst_buildgraph.cpp
diff --git a/src/lib/buildgraph/tst_buildgraph.h b/src/lib/corelib/buildgraph/tst_buildgraph.h
index 470300c4b..470300c4b 100644
--- a/src/lib/buildgraph/tst_buildgraph.h
+++ b/src/lib/corelib/buildgraph/tst_buildgraph.h
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro
new file mode 100644
index 000000000..2eb02e7a3
--- /dev/null
+++ b/src/lib/corelib/corelib.pro
@@ -0,0 +1,31 @@
+TARGET = qbscore
+include(../library.pri)
+
+QT += script gui
+all_tests:QT += testlib
+
+INCLUDEPATH += $$PWD
+
+CONFIG += depend_includepath
+DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB      # needed for QmlJS
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+include(api/api.pri)
+include(buildgraph/buildgraph.pri)
+include(jsextensions/jsextensions.pri)
+include(language/language.pri)
+include(logging/logging.pri)
+include(parser/parser.pri)
+include(tools/tools.pri)
+
+HEADERS += \
+    qbs.h
+
+!qbs_no_dev_install {
+    qbs_h.files = qbs.h
+    qbs_h.path = $${QBS_INSTALL_PREFIX}/include/qbs
+    use_pri.files = use_installed_corelib.pri ../../../qbs_version.pri
+    use_pri.path = $${qbs_h.path}
+    INSTALLS += qbs_h use_pri
+}
diff --git a/src/lib/lib.qbs b/src/lib/corelib/corelib.qbs
index ae41b3023..e14ba956c 100644
--- a/src/lib/lib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -1,36 +1,21 @@
 import qbs 1.0
-import "../../version.js" as Version
+import "../Library.qbs" as QbsLibrary
 
-Product {
+QbsLibrary {
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ["core", "gui", "script", "xml"] }
+    Depends { name: "Qt"; submodules: ["gui", "script", "xml"] }
     Depends { condition: project.enableUnitTests; name: "Qt.test" }
     name: "qbscore"
-    version: Version.qbsVersion()
-    type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary"
-    targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name
-    destinationDirectory: qbs.targetOS.contains("windows") ? "bin" : "lib"
-    cpp.treatWarningsAsErrors: true
-    cpp.includePaths: [
+    cpp.includePaths: base.concat([
         ".",
-        ".."     // for the plugin headers
-    ]
-    cpp.defines: [
-        "QBS_VERSION=\"" + Version.qbsVersion() + "\"",
+        "../.." // for the plugin headers
+    ])
+    cpp.defines: base.concat([
+        "QBS_VERSION=\"" + version + "\"",
         "QT_CREATOR", "QML_BUILD_STATIC_LIB",   // needed for QmlJS
         "SRCDIR=\"" + path + "\""
-    ].concat(type == "staticlibrary" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"])
-    Properties {
-        condition: qbs.toolchain.contains("msvc")
-        cpp.cxxFlags: ["/WX"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc") && !qbs.targetOS.contains("windows")
-        cpp.cxxFlags: ["-Werror"]
-    }
-    cpp.installNamePrefix: "@rpath/"
+    ])
 
-    property string headerInstallPrefix: "/include/qbs"
     Group {
         name: product.name
         files: ["qbs.h"]
@@ -332,8 +317,8 @@ Product {
     Group {
         name: "use_installed.pri"
         files: [
-            "use_installed.pri",
-            "../../qbs_version.pri"
+            "use_installed_corelib.pri",
+            "../../../qbs_version.pri"
         ]
         qbs.install: project.installApiHeaders
         qbs.installDir: headerInstallPrefix
@@ -350,16 +335,7 @@ Product {
             "tools/tst_tools.cpp"
         ]
     }
-    Group {
-        fileTagsFilter: product.type.concat("dynamiclibrary_symlink")
-        qbs.install: true
-        qbs.installDir: project.libInstallDir
-    }
     Export {
-        Depends { name: "cpp" }
         Depends { name: "Qt"; submodules: ["script", "xml"] }
-        cpp.rpaths: project.libRPaths
-        cpp.includePaths: path
-        cpp.defines: product.type === "staticlibrary" ? ["QBS_STATIC_LIB"] : []
     }
 }
diff --git a/src/lib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp
index a66f2b21b..a66f2b21b 100644
--- a/src/lib/jsextensions/domxml.cpp
+++ b/src/lib/corelib/jsextensions/domxml.cpp
diff --git a/src/lib/jsextensions/domxml.h b/src/lib/corelib/jsextensions/domxml.h
index 7df603328..7df603328 100644
--- a/src/lib/jsextensions/domxml.h
+++ b/src/lib/corelib/jsextensions/domxml.h
diff --git a/src/lib/jsextensions/file.cpp b/src/lib/corelib/jsextensions/file.cpp
index 1e6f2947c..1e6f2947c 100644
--- a/src/lib/jsextensions/file.cpp
+++ b/src/lib/corelib/jsextensions/file.cpp
diff --git a/src/lib/jsextensions/file.h b/src/lib/corelib/jsextensions/file.h
index 874c40c71..874c40c71 100644
--- a/src/lib/jsextensions/file.h
+++ b/src/lib/corelib/jsextensions/file.h
diff --git a/src/lib/jsextensions/jsextensions.cpp b/src/lib/corelib/jsextensions/jsextensions.cpp
index b6b5e099b..b6b5e099b 100644
--- a/src/lib/jsextensions/jsextensions.cpp
+++ b/src/lib/corelib/jsextensions/jsextensions.cpp
diff --git a/src/lib/jsextensions/jsextensions.h b/src/lib/corelib/jsextensions/jsextensions.h
index e268ec215..e268ec215 100644
--- a/src/lib/jsextensions/jsextensions.h
+++ b/src/lib/corelib/jsextensions/jsextensions.h
diff --git a/src/lib/jsextensions/jsextensions.pri b/src/lib/corelib/jsextensions/jsextensions.pri
index 21c97ef64..21c97ef64 100644
--- a/src/lib/jsextensions/jsextensions.pri
+++ b/src/lib/corelib/jsextensions/jsextensions.pri
diff --git a/src/lib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp
index 83d92e776..83d92e776 100644
--- a/src/lib/jsextensions/moduleproperties.cpp
+++ b/src/lib/corelib/jsextensions/moduleproperties.cpp
diff --git a/src/lib/jsextensions/moduleproperties.h b/src/lib/corelib/jsextensions/moduleproperties.h
index 81f27f6ec..81f27f6ec 100644
--- a/src/lib/jsextensions/moduleproperties.h
+++ b/src/lib/corelib/jsextensions/moduleproperties.h
diff --git a/src/lib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp
index 3cf74ab31..3cf74ab31 100644
--- a/src/lib/jsextensions/process.cpp
+++ b/src/lib/corelib/jsextensions/process.cpp
diff --git a/src/lib/jsextensions/process.h b/src/lib/corelib/jsextensions/process.h
index 1dea021a3..1dea021a3 100644
--- a/src/lib/jsextensions/process.h
+++ b/src/lib/corelib/jsextensions/process.h
diff --git a/src/lib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp
index 7129ee955..7129ee955 100644
--- a/src/lib/jsextensions/textfile.cpp
+++ b/src/lib/corelib/jsextensions/textfile.cpp
diff --git a/src/lib/jsextensions/textfile.h b/src/lib/corelib/jsextensions/textfile.h
index ff8aaf43b..ff8aaf43b 100644
--- a/src/lib/jsextensions/textfile.h
+++ b/src/lib/corelib/jsextensions/textfile.h
diff --git a/src/lib/language/artifactproperties.cpp b/src/lib/corelib/language/artifactproperties.cpp
index 470163004..470163004 100644
--- a/src/lib/language/artifactproperties.cpp
+++ b/src/lib/corelib/language/artifactproperties.cpp
diff --git a/src/lib/language/artifactproperties.h b/src/lib/corelib/language/artifactproperties.h
index 8c688da20..8c688da20 100644
--- a/src/lib/language/artifactproperties.h
+++ b/src/lib/corelib/language/artifactproperties.h
diff --git a/src/lib/language/asttools.cpp b/src/lib/corelib/language/asttools.cpp
index c394fc187..c394fc187 100644
--- a/src/lib/language/asttools.cpp
+++ b/src/lib/corelib/language/asttools.cpp
diff --git a/src/lib/language/asttools.h b/src/lib/corelib/language/asttools.h
index cb0f0b852..cb0f0b852 100644
--- a/src/lib/language/asttools.h
+++ b/src/lib/corelib/language/asttools.h
diff --git a/src/lib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index 4bbc02579..4bbc02579 100644
--- a/src/lib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
diff --git a/src/lib/language/builtindeclarations.h b/src/lib/corelib/language/builtindeclarations.h
index b793c5aae..b793c5aae 100644
--- a/src/lib/language/builtindeclarations.h
+++ b/src/lib/corelib/language/builtindeclarations.h
diff --git a/src/lib/language/builtinvalue.cpp b/src/lib/corelib/language/builtinvalue.cpp
index d7f98083d..d7f98083d 100644
--- a/src/lib/language/builtinvalue.cpp
+++ b/src/lib/corelib/language/builtinvalue.cpp
diff --git a/src/lib/language/builtinvalue.h b/src/lib/corelib/language/builtinvalue.h
index 77c6fd14a..77c6fd14a 100644
--- a/src/lib/language/builtinvalue.h
+++ b/src/lib/corelib/language/builtinvalue.h
diff --git a/src/lib/language/evaluationdata.h b/src/lib/corelib/language/evaluationdata.h
index 930ac1f0c..930ac1f0c 100644
--- a/src/lib/language/evaluationdata.h
+++ b/src/lib/corelib/language/evaluationdata.h
diff --git a/src/lib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp
index 29b3837fd..29b3837fd 100644
--- a/src/lib/language/evaluator.cpp
+++ b/src/lib/corelib/language/evaluator.cpp
diff --git a/src/lib/language/evaluator.h b/src/lib/corelib/language/evaluator.h
index a17605af1..a17605af1 100644
--- a/src/lib/language/evaluator.h
+++ b/src/lib/corelib/language/evaluator.h
diff --git a/src/lib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index fb89f53e6..fb89f53e6 100644
--- a/src/lib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
diff --git a/src/lib/language/evaluatorscriptclass.h b/src/lib/corelib/language/evaluatorscriptclass.h
index 4803a21b9..4803a21b9 100644
--- a/src/lib/language/evaluatorscriptclass.h
+++ b/src/lib/corelib/language/evaluatorscriptclass.h
diff --git a/src/lib/language/filecontext.cpp b/src/lib/corelib/language/filecontext.cpp
index 570b40c66..570b40c66 100644
--- a/src/lib/language/filecontext.cpp
+++ b/src/lib/corelib/language/filecontext.cpp
diff --git a/src/lib/language/filecontext.h b/src/lib/corelib/language/filecontext.h
index 75f93f04c..75f93f04c 100644
--- a/src/lib/language/filecontext.h
+++ b/src/lib/corelib/language/filecontext.h
diff --git a/src/lib/language/filetags.cpp b/src/lib/corelib/language/filetags.cpp
index a5af1f0b2..a5af1f0b2 100644
--- a/src/lib/language/filetags.cpp
+++ b/src/lib/corelib/language/filetags.cpp
diff --git a/src/lib/language/filetags.h b/src/lib/corelib/language/filetags.h
index 44effc509..44effc509 100644
--- a/src/lib/language/filetags.h
+++ b/src/lib/corelib/language/filetags.h
diff --git a/src/lib/language/forward_decls.h b/src/lib/corelib/language/forward_decls.h
index dc7c572df..dc7c572df 100644
--- a/src/lib/language/forward_decls.h
+++ b/src/lib/corelib/language/forward_decls.h
diff --git a/src/lib/language/functiondeclaration.h b/src/lib/corelib/language/functiondeclaration.h
index 656997e7a..656997e7a 100644
--- a/src/lib/language/functiondeclaration.h
+++ b/src/lib/corelib/language/functiondeclaration.h
diff --git a/src/lib/language/identifiersearch.cpp b/src/lib/corelib/language/identifiersearch.cpp
index 813e87922..813e87922 100644
--- a/src/lib/language/identifiersearch.cpp
+++ b/src/lib/corelib/language/identifiersearch.cpp
diff --git a/src/lib/language/identifiersearch.h b/src/lib/corelib/language/identifiersearch.h
index f82ee3262..f82ee3262 100644
--- a/src/lib/language/identifiersearch.h
+++ b/src/lib/corelib/language/identifiersearch.h
diff --git a/src/lib/language/importversion.cpp b/src/lib/corelib/language/importversion.cpp
index 848775016..848775016 100644
--- a/src/lib/language/importversion.cpp
+++ b/src/lib/corelib/language/importversion.cpp
diff --git a/src/lib/language/importversion.h b/src/lib/corelib/language/importversion.h
index 034258793..034258793 100644
--- a/src/lib/language/importversion.h
+++ b/src/lib/corelib/language/importversion.h
diff --git a/src/lib/language/item.cpp b/src/lib/corelib/language/item.cpp
index 7b42df5e6..7b42df5e6 100644
--- a/src/lib/language/item.cpp
+++ b/src/lib/corelib/language/item.cpp
diff --git a/src/lib/language/item.h b/src/lib/corelib/language/item.h
index 866927a0e..866927a0e 100644
--- a/src/lib/language/item.h
+++ b/src/lib/corelib/language/item.h
diff --git a/src/lib/language/itemdeclaration.cpp b/src/lib/corelib/language/itemdeclaration.cpp
index e2fdb9330..e2fdb9330 100644
--- a/src/lib/language/itemdeclaration.cpp
+++ b/src/lib/corelib/language/itemdeclaration.cpp
diff --git a/src/lib/language/itemdeclaration.h b/src/lib/corelib/language/itemdeclaration.h
index 25a0e3fd3..25a0e3fd3 100644
--- a/src/lib/language/itemdeclaration.h
+++ b/src/lib/corelib/language/itemdeclaration.h
diff --git a/src/lib/language/itemobserver.h b/src/lib/corelib/language/itemobserver.h
index 684b33d14..684b33d14 100644
--- a/src/lib/language/itemobserver.h
+++ b/src/lib/corelib/language/itemobserver.h
diff --git a/src/lib/language/itempool.cpp b/src/lib/corelib/language/itempool.cpp
index a07022c3f..a07022c3f 100644
--- a/src/lib/language/itempool.cpp
+++ b/src/lib/corelib/language/itempool.cpp
diff --git a/src/lib/language/itempool.h b/src/lib/corelib/language/itempool.h
index 04d7bbb40..04d7bbb40 100644
--- a/src/lib/language/itempool.h
+++ b/src/lib/corelib/language/itempool.h
diff --git a/src/lib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp
index ba4859899..ba4859899 100644
--- a/src/lib/language/itemreader.cpp
+++ b/src/lib/corelib/language/itemreader.cpp
diff --git a/src/lib/language/itemreader.h b/src/lib/corelib/language/itemreader.h
index 266c30f93..266c30f93 100644
--- a/src/lib/language/itemreader.h
+++ b/src/lib/corelib/language/itemreader.h
diff --git a/src/lib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp
index a08a73648..a08a73648 100644
--- a/src/lib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/language/itemreaderastvisitor.cpp
diff --git a/src/lib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h
index 409b5104e..409b5104e 100644
--- a/src/lib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/language/itemreaderastvisitor.h
diff --git a/src/lib/language/jsimports.h b/src/lib/corelib/language/jsimports.h
index 4e0ef9130..4e0ef9130 100644
--- a/src/lib/language/jsimports.h
+++ b/src/lib/corelib/language/jsimports.h
diff --git a/src/lib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 92622787f..92622787f 100644
--- a/src/lib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
diff --git a/src/lib/language/language.h b/src/lib/corelib/language/language.h
index d359686b1..d359686b1 100644
--- a/src/lib/language/language.h
+++ b/src/lib/corelib/language/language.h
diff --git a/src/lib/language/language.pri b/src/lib/corelib/language/language.pri
index 09d7e9a1b..09d7e9a1b 100644
--- a/src/lib/language/language.pri
+++ b/src/lib/corelib/language/language.pri
diff --git a/src/lib/language/loader.cpp b/src/lib/corelib/language/loader.cpp
index 8a3f3c98f..8a3f3c98f 100644
--- a/src/lib/language/loader.cpp
+++ b/src/lib/corelib/language/loader.cpp
diff --git a/src/lib/language/loader.h b/src/lib/corelib/language/loader.h
index 64e3a2ad6..64e3a2ad6 100644
--- a/src/lib/language/loader.h
+++ b/src/lib/corelib/language/loader.h
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index a0c06bb61..a0c06bb61 100644
--- a/src/lib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
diff --git a/src/lib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index f6f62a2c3..f6f62a2c3 100644
--- a/src/lib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
diff --git a/src/lib/language/preparescriptobserver.cpp b/src/lib/corelib/language/preparescriptobserver.cpp
index c4f61fd29..c4f61fd29 100644
--- a/src/lib/language/preparescriptobserver.cpp
+++ b/src/lib/corelib/language/preparescriptobserver.cpp
diff --git a/src/lib/language/preparescriptobserver.h b/src/lib/corelib/language/preparescriptobserver.h
index 21b101a2f..21b101a2f 100644
--- a/src/lib/language/preparescriptobserver.h
+++ b/src/lib/corelib/language/preparescriptobserver.h
diff --git a/src/lib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 06205c7fe..06205c7fe 100644
--- a/src/lib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
diff --git a/src/lib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h
index d468c8d5e..d468c8d5e 100644
--- a/src/lib/language/projectresolver.h
+++ b/src/lib/corelib/language/projectresolver.h
diff --git a/src/lib/language/property.h b/src/lib/corelib/language/property.h
index b989e5316..b989e5316 100644
--- a/src/lib/language/property.h
+++ b/src/lib/corelib/language/property.h
diff --git a/src/lib/language/propertydeclaration.cpp b/src/lib/corelib/language/propertydeclaration.cpp
index 79236e6da..79236e6da 100644
--- a/src/lib/language/propertydeclaration.cpp
+++ b/src/lib/corelib/language/propertydeclaration.cpp
diff --git a/src/lib/language/propertydeclaration.h b/src/lib/corelib/language/propertydeclaration.h
index 441e42af9..441e42af9 100644
--- a/src/lib/language/propertydeclaration.h
+++ b/src/lib/corelib/language/propertydeclaration.h
diff --git a/src/lib/language/propertymapinternal.cpp b/src/lib/corelib/language/propertymapinternal.cpp
index 063f9e947..063f9e947 100644
--- a/src/lib/language/propertymapinternal.cpp
+++ b/src/lib/corelib/language/propertymapinternal.cpp
diff --git a/src/lib/language/propertymapinternal.h b/src/lib/corelib/language/propertymapinternal.h
index 329f6ddb2..329f6ddb2 100644
--- a/src/lib/language/propertymapinternal.h
+++ b/src/lib/corelib/language/propertymapinternal.h
diff --git a/src/lib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index e7f475d4c..e7f475d4c 100644
--- a/src/lib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
diff --git a/src/lib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h
index a2de9d9ea..a2de9d9ea 100644
--- a/src/lib/language/scriptengine.h
+++ b/src/lib/corelib/language/scriptengine.h
diff --git a/src/lib/language/scriptpropertyobserver.h b/src/lib/corelib/language/scriptpropertyobserver.h
index e40ccc1d2..e40ccc1d2 100644
--- a/src/lib/language/scriptpropertyobserver.h
+++ b/src/lib/corelib/language/scriptpropertyobserver.h
diff --git a/src/lib/language/testdata/Banana b/src/lib/corelib/language/testdata/Banana
index 53164be8a..53164be8a 100644
--- a/src/lib/language/testdata/Banana
+++ b/src/lib/corelib/language/testdata/Banana
diff --git a/src/lib/language/testdata/aboutdialog.cpp b/src/lib/corelib/language/testdata/aboutdialog.cpp
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/aboutdialog.cpp
+++ b/src/lib/corelib/language/testdata/aboutdialog.cpp
diff --git a/src/lib/language/testdata/baseproperty.qbs b/src/lib/corelib/language/testdata/baseproperty.qbs
index 74024aedc..74024aedc 100644
--- a/src/lib/language/testdata/baseproperty.qbs
+++ b/src/lib/corelib/language/testdata/baseproperty.qbs
diff --git a/src/lib/language/testdata/baseproperty_base.qbs b/src/lib/corelib/language/testdata/baseproperty_base.qbs
index 85b64b76e..85b64b76e 100644
--- a/src/lib/language/testdata/baseproperty_base.qbs
+++ b/src/lib/corelib/language/testdata/baseproperty_base.qbs
diff --git a/src/lib/language/testdata/buildconfigstringlistsyntax.qbs b/src/lib/corelib/language/testdata/buildconfigstringlistsyntax.qbs
index 623919317..623919317 100644
--- a/src/lib/language/testdata/buildconfigstringlistsyntax.qbs
+++ b/src/lib/corelib/language/testdata/buildconfigstringlistsyntax.qbs
diff --git a/src/lib/language/testdata/builtinFunctionInSearchPathsProperty.qbs b/src/lib/corelib/language/testdata/builtinFunctionInSearchPathsProperty.qbs
index f8f1b4d17..f8f1b4d17 100644
--- a/src/lib/language/testdata/builtinFunctionInSearchPathsProperty.qbs
+++ b/src/lib/corelib/language/testdata/builtinFunctionInSearchPathsProperty.qbs
diff --git a/src/lib/language/testdata/canonicalArchitecture.qbs b/src/lib/corelib/language/testdata/canonicalArchitecture.qbs
index 94da7b276..94da7b276 100644
--- a/src/lib/language/testdata/canonicalArchitecture.qbs
+++ b/src/lib/corelib/language/testdata/canonicalArchitecture.qbs
diff --git a/src/lib/language/testdata/conditionaldepends.qbs b/src/lib/corelib/language/testdata/conditionaldepends.qbs
index 8ad3660ec..8ad3660ec 100644
--- a/src/lib/language/testdata/conditionaldepends.qbs
+++ b/src/lib/corelib/language/testdata/conditionaldepends.qbs
diff --git a/src/lib/language/testdata/conditionaldepends_base.qbs b/src/lib/corelib/language/testdata/conditionaldepends_base.qbs
index 81782ba44..81782ba44 100644
--- a/src/lib/language/testdata/conditionaldepends_base.qbs
+++ b/src/lib/corelib/language/testdata/conditionaldepends_base.qbs
diff --git a/src/lib/language/testdata/drawline.asm b/src/lib/corelib/language/testdata/drawline.asm
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/drawline.asm
+++ b/src/lib/corelib/language/testdata/drawline.asm
diff --git a/src/lib/language/testdata/environmentvariable.qbs b/src/lib/corelib/language/testdata/environmentvariable.qbs
index b930e8511..b930e8511 100644
--- a/src/lib/language/testdata/environmentvariable.qbs
+++ b/src/lib/corelib/language/testdata/environmentvariable.qbs
diff --git a/src/lib/language/testdata/erroneous/importloop1.qbs b/src/lib/corelib/language/testdata/erroneous/importloop1.qbs
index 91e8f620f..91e8f620f 100644
--- a/src/lib/language/testdata/erroneous/importloop1.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/importloop1.qbs
diff --git a/src/lib/language/testdata/erroneous/importloop2.qbs b/src/lib/corelib/language/testdata/erroneous/importloop2.qbs
index c41fe7e9f..c41fe7e9f 100644
--- a/src/lib/language/testdata/erroneous/importloop2.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/importloop2.qbs
diff --git a/src/lib/language/testdata/erroneous/invalid_child_item_type.qbs b/src/lib/corelib/language/testdata/erroneous/invalid_child_item_type.qbs
index 2341d4b9c..2341d4b9c 100644
--- a/src/lib/language/testdata/erroneous/invalid_child_item_type.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/invalid_child_item_type.qbs
diff --git a/src/lib/language/testdata/erroneous/invalid_file.qbs b/src/lib/corelib/language/testdata/erroneous/invalid_file.qbs
index 18f2b044d..18f2b044d 100644
--- a/src/lib/language/testdata/erroneous/invalid_file.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/invalid_file.qbs
diff --git a/src/lib/language/testdata/erroneous/invalid_property_type.qbs b/src/lib/corelib/language/testdata/erroneous/invalid_property_type.qbs
index b9b392736..b9b392736 100644
--- a/src/lib/language/testdata/erroneous/invalid_property_type.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/invalid_property_type.qbs
diff --git a/src/lib/language/testdata/erroneous/invalid_stringlist_element.qbs b/src/lib/corelib/language/testdata/erroneous/invalid_stringlist_element.qbs
index fc30a2af6..fc30a2af6 100644
--- a/src/lib/language/testdata/erroneous/invalid_stringlist_element.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/invalid_stringlist_element.qbs
diff --git a/src/lib/language/testdata/erroneous/main.cpp b/src/lib/corelib/language/testdata/erroneous/main.cpp
index 8b8d58de0..8b8d58de0 100644
--- a/src/lib/language/testdata/erroneous/main.cpp
+++ b/src/lib/corelib/language/testdata/erroneous/main.cpp
diff --git a/src/lib/language/testdata/erroneous/multiple_exports.qbs b/src/lib/corelib/language/testdata/erroneous/multiple_exports.qbs
index 17c7f6a14..17c7f6a14 100644
--- a/src/lib/language/testdata/erroneous/multiple_exports.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/multiple_exports.qbs
diff --git a/src/lib/language/testdata/erroneous/multiple_properties_in_subproject.qbs b/src/lib/corelib/language/testdata/erroneous/multiple_properties_in_subproject.qbs
index 0ecb41b34..0ecb41b34 100644
--- a/src/lib/language/testdata/erroneous/multiple_properties_in_subproject.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/multiple_properties_in_subproject.qbs
diff --git a/src/lib/language/testdata/erroneous/nonexistentouter.qbs b/src/lib/corelib/language/testdata/erroneous/nonexistentouter.qbs
index 6c5899b5d..6c5899b5d 100644
--- a/src/lib/language/testdata/erroneous/nonexistentouter.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/nonexistentouter.qbs
diff --git a/src/lib/language/testdata/erroneous/references_cycle.qbs b/src/lib/corelib/language/testdata/erroneous/references_cycle.qbs
index 6d0960f09..6d0960f09 100644
--- a/src/lib/language/testdata/erroneous/references_cycle.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/references_cycle.qbs
diff --git a/src/lib/language/testdata/erroneous/references_cycle2.qbs b/src/lib/corelib/language/testdata/erroneous/references_cycle2.qbs
index 0b0d2734d..0b0d2734d 100644
--- a/src/lib/language/testdata/erroneous/references_cycle2.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/references_cycle2.qbs
diff --git a/src/lib/language/testdata/erroneous/references_cycle3.qbs b/src/lib/corelib/language/testdata/erroneous/references_cycle3.qbs
index 2a237d154..2a237d154 100644
--- a/src/lib/language/testdata/erroneous/references_cycle3.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/references_cycle3.qbs
diff --git a/src/lib/language/testdata/erroneous/reserved_name_in_import.qbs b/src/lib/corelib/language/testdata/erroneous/reserved_name_in_import.qbs
index 3940109d0..3940109d0 100644
--- a/src/lib/language/testdata/erroneous/reserved_name_in_import.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/reserved_name_in_import.qbs
diff --git a/src/lib/language/testdata/erroneous/submodule_syntax.qbs b/src/lib/corelib/language/testdata/erroneous/submodule_syntax.qbs
index 4254bb8f6..4254bb8f6 100644
--- a/src/lib/language/testdata/erroneous/submodule_syntax.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/submodule_syntax.qbs
diff --git a/src/lib/language/testdata/erroneous/subproject_cycle.qbs b/src/lib/corelib/language/testdata/erroneous/subproject_cycle.qbs
index 0a9cd289f..0a9cd289f 100644
--- a/src/lib/language/testdata/erroneous/subproject_cycle.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/subproject_cycle.qbs
diff --git a/src/lib/language/testdata/erroneous/subproject_cycle2.qbs b/src/lib/corelib/language/testdata/erroneous/subproject_cycle2.qbs
index ab92d76dd..ab92d76dd 100644
--- a/src/lib/language/testdata/erroneous/subproject_cycle2.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/subproject_cycle2.qbs
diff --git a/src/lib/language/testdata/erroneous/subproject_cycle3.qbs b/src/lib/corelib/language/testdata/erroneous/subproject_cycle3.qbs
index af1e50f5a..af1e50f5a 100644
--- a/src/lib/language/testdata/erroneous/subproject_cycle3.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/subproject_cycle3.qbs
diff --git a/src/lib/language/testdata/erroneous/throw_in_property_binding.qbs b/src/lib/corelib/language/testdata/erroneous/throw_in_property_binding.qbs
index fc251b1a4..fc251b1a4 100644
--- a/src/lib/language/testdata/erroneous/throw_in_property_binding.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/throw_in_property_binding.qbs
diff --git a/src/lib/language/testdata/erroneous/undeclared_item.qbs b/src/lib/corelib/language/testdata/erroneous/undeclared_item.qbs
index b2edbf013..b2edbf013 100644
--- a/src/lib/language/testdata/erroneous/undeclared_item.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/undeclared_item.qbs
diff --git a/src/lib/language/testdata/erroneous/undeclared_property.qbs b/src/lib/corelib/language/testdata/erroneous/undeclared_property.qbs
index 1dad5f747..1dad5f747 100644
--- a/src/lib/language/testdata/erroneous/undeclared_property.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/undeclared_property.qbs
diff --git a/src/lib/language/testdata/erroneous/unknown_item_type.qbs b/src/lib/corelib/language/testdata/erroneous/unknown_item_type.qbs
index 9e34e9243..9e34e9243 100644
--- a/src/lib/language/testdata/erroneous/unknown_item_type.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/unknown_item_type.qbs
diff --git a/src/lib/language/testdata/erroneous/unknown_module.qbs b/src/lib/corelib/language/testdata/erroneous/unknown_module.qbs
index dcfc79a9c..dcfc79a9c 100644
--- a/src/lib/language/testdata/erroneous/unknown_module.qbs
+++ b/src/lib/corelib/language/testdata/erroneous/unknown_module.qbs
diff --git a/src/lib/language/testdata/exports.qbs b/src/lib/corelib/language/testdata/exports.qbs
index b1adfc214..b1adfc214 100644
--- a/src/lib/language/testdata/exports.qbs
+++ b/src/lib/corelib/language/testdata/exports.qbs
diff --git a/src/lib/language/testdata/exports_product.qbs b/src/lib/corelib/language/testdata/exports_product.qbs
index 78136fc32..78136fc32 100644
--- a/src/lib/language/testdata/exports_product.qbs
+++ b/src/lib/corelib/language/testdata/exports_product.qbs
diff --git a/src/lib/language/testdata/filecontextproperties.qbs b/src/lib/corelib/language/testdata/filecontextproperties.qbs
index 5c435b3ba..5c435b3ba 100644
--- a/src/lib/language/testdata/filecontextproperties.qbs
+++ b/src/lib/corelib/language/testdata/filecontextproperties.qbs
diff --git a/src/lib/language/testdata/filetags.qbs b/src/lib/corelib/language/testdata/filetags.qbs
index 38182e5f1..38182e5f1 100644
--- a/src/lib/language/testdata/filetags.qbs
+++ b/src/lib/corelib/language/testdata/filetags.qbs
diff --git a/src/lib/language/testdata/getNativeSetting.qbs b/src/lib/corelib/language/testdata/getNativeSetting.qbs
index c414c79f9..c414c79f9 100644
--- a/src/lib/language/testdata/getNativeSetting.qbs
+++ b/src/lib/corelib/language/testdata/getNativeSetting.qbs
diff --git a/src/lib/language/testdata/groupconditions.qbs b/src/lib/corelib/language/testdata/groupconditions.qbs
index 244c80c2c..244c80c2c 100644
--- a/src/lib/language/testdata/groupconditions.qbs
+++ b/src/lib/corelib/language/testdata/groupconditions.qbs
diff --git a/src/lib/language/testdata/groupname.qbs b/src/lib/corelib/language/testdata/groupname.qbs
index 22e58765c..22e58765c 100644
--- a/src/lib/language/testdata/groupname.qbs
+++ b/src/lib/corelib/language/testdata/groupname.qbs
diff --git a/src/lib/language/testdata/homeDirectory.qbs b/src/lib/corelib/language/testdata/homeDirectory.qbs
index 1ceeb5bbd..1ceeb5bbd 100644
--- a/src/lib/language/testdata/homeDirectory.qbs
+++ b/src/lib/corelib/language/testdata/homeDirectory.qbs
diff --git a/src/lib/language/testdata/idusage.qbs b/src/lib/corelib/language/testdata/idusage.qbs
index 42dc43ad5..42dc43ad5 100644
--- a/src/lib/language/testdata/idusage.qbs
+++ b/src/lib/corelib/language/testdata/idusage.qbs
diff --git a/src/lib/language/testdata/idusagebase.qbs b/src/lib/corelib/language/testdata/idusagebase.qbs
index 483a00ccf..483a00ccf 100644
--- a/src/lib/language/testdata/idusagebase.qbs
+++ b/src/lib/corelib/language/testdata/idusagebase.qbs
diff --git a/src/lib/language/testdata/invalidBindingInDisabledItem.qbs b/src/lib/corelib/language/testdata/invalidBindingInDisabledItem.qbs
index e3e03a319..e3e03a319 100644
--- a/src/lib/language/testdata/invalidBindingInDisabledItem.qbs
+++ b/src/lib/corelib/language/testdata/invalidBindingInDisabledItem.qbs
diff --git a/src/lib/language/testdata/jsextensions.js b/src/lib/corelib/language/testdata/jsextensions.js
index d26936911..d26936911 100644
--- a/src/lib/language/testdata/jsextensions.js
+++ b/src/lib/corelib/language/testdata/jsextensions.js
diff --git a/src/lib/language/testdata/jsimportsinmultiplescopes.js b/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.js
index 4e939505c..4e939505c 100644
--- a/src/lib/language/testdata/jsimportsinmultiplescopes.js
+++ b/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.js
diff --git a/src/lib/language/testdata/jsimportsinmultiplescopes.qbs b/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.qbs
index 388cf974b..388cf974b 100644
--- a/src/lib/language/testdata/jsimportsinmultiplescopes.qbs
+++ b/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.qbs
diff --git a/src/lib/language/testdata/main.cpp b/src/lib/corelib/language/testdata/main.cpp
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/main.cpp
+++ b/src/lib/corelib/language/testdata/main.cpp
diff --git a/src/lib/language/testdata/moduleproperties.qbs b/src/lib/corelib/language/testdata/moduleproperties.qbs
index c466a15cf..c466a15cf 100644
--- a/src/lib/language/testdata/moduleproperties.qbs
+++ b/src/lib/corelib/language/testdata/moduleproperties.qbs
diff --git a/src/lib/language/testdata/modules.qbs b/src/lib/corelib/language/testdata/modules.qbs
index 7841def35..7841def35 100644
--- a/src/lib/language/testdata/modules.qbs
+++ b/src/lib/corelib/language/testdata/modules.qbs
diff --git a/src/lib/language/testdata/modules/dummy/dummy.qbs b/src/lib/corelib/language/testdata/modules/dummy/dummy.qbs
index 9484a70b8..9484a70b8 100644
--- a/src/lib/language/testdata/modules/dummy/dummy.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummy/dummy.qbs
diff --git a/src/lib/language/testdata/modules/dummy/dummy_base.qbs b/src/lib/corelib/language/testdata/modules/dummy/dummy_base.qbs
index 0ecd8a1d8..0ecd8a1d8 100644
--- a/src/lib/language/testdata/modules/dummy/dummy_base.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummy/dummy_base.qbs
diff --git a/src/lib/language/testdata/modules/dummy2/dummy2.qbs b/src/lib/corelib/language/testdata/modules/dummy2/dummy2.qbs
index f60c38a71..f60c38a71 100644
--- a/src/lib/language/testdata/modules/dummy2/dummy2.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummy2/dummy2.qbs
diff --git a/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs b/src/lib/corelib/language/testdata/modules/dummyqt/core/dummycore.qbs
index 13f5e6fc1..13f5e6fc1 100644
--- a/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummyqt/core/dummycore.qbs
diff --git a/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs b/src/lib/corelib/language/testdata/modules/dummyqt/gui/dummygui.qbs
index a42003c34..a42003c34 100644
--- a/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummyqt/gui/dummygui.qbs
diff --git a/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs b/src/lib/corelib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
index 2da3af050..2da3af050 100644
--- a/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
+++ b/src/lib/corelib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
diff --git a/src/lib/language/testdata/modules/scopemod/scopemod.qbs b/src/lib/corelib/language/testdata/modules/scopemod/scopemod.qbs
index ba7dbcbf0..ba7dbcbf0 100644
--- a/src/lib/language/testdata/modules/scopemod/scopemod.qbs
+++ b/src/lib/corelib/language/testdata/modules/scopemod/scopemod.qbs
diff --git a/src/lib/language/testdata/modulescope.qbs b/src/lib/corelib/language/testdata/modulescope.qbs
index c127f0c61..c127f0c61 100644
--- a/src/lib/language/testdata/modulescope.qbs
+++ b/src/lib/corelib/language/testdata/modulescope.qbs
diff --git a/src/lib/language/testdata/modulescope_base.qbs b/src/lib/corelib/language/testdata/modulescope_base.qbs
index 16a9875fa..16a9875fa 100644
--- a/src/lib/language/testdata/modulescope_base.qbs
+++ b/src/lib/corelib/language/testdata/modulescope_base.qbs
diff --git a/src/lib/language/testdata/narf b/src/lib/corelib/language/testdata/narf
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/narf
+++ b/src/lib/corelib/language/testdata/narf
diff --git a/src/lib/language/testdata/narf.zort b/src/lib/corelib/language/testdata/narf.zort
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/narf.zort
+++ b/src/lib/corelib/language/testdata/narf.zort
diff --git a/src/lib/language/testdata/nativesettings.ini b/src/lib/corelib/language/testdata/nativesettings.ini
index 4caf32e56..4caf32e56 100644
--- a/src/lib/language/testdata/nativesettings.ini
+++ b/src/lib/corelib/language/testdata/nativesettings.ini
diff --git a/src/lib/language/testdata/outerInGroup.qbs b/src/lib/corelib/language/testdata/outerInGroup.qbs
index 751392a4d..751392a4d 100644
--- a/src/lib/language/testdata/outerInGroup.qbs
+++ b/src/lib/corelib/language/testdata/outerInGroup.qbs
diff --git a/src/lib/language/testdata/pathproperties.qbs b/src/lib/corelib/language/testdata/pathproperties.qbs
index f0eeabf57..f0eeabf57 100644
--- a/src/lib/language/testdata/pathproperties.qbs
+++ b/src/lib/corelib/language/testdata/pathproperties.qbs
diff --git a/src/lib/language/testdata/productconditions.qbs b/src/lib/corelib/language/testdata/productconditions.qbs
index 336c41340..336c41340 100644
--- a/src/lib/language/testdata/productconditions.qbs
+++ b/src/lib/corelib/language/testdata/productconditions.qbs
diff --git a/src/lib/language/testdata/productdirectories.qbs b/src/lib/corelib/language/testdata/productdirectories.qbs
index dc4315207..dc4315207 100644
--- a/src/lib/language/testdata/productdirectories.qbs
+++ b/src/lib/corelib/language/testdata/productdirectories.qbs
diff --git a/src/lib/language/testdata/profilevaluesandoverriddenvalues.qbs b/src/lib/corelib/language/testdata/profilevaluesandoverriddenvalues.qbs
index cc1b7b2a2..cc1b7b2a2 100644
--- a/src/lib/language/testdata/profilevaluesandoverriddenvalues.qbs
+++ b/src/lib/corelib/language/testdata/profilevaluesandoverriddenvalues.qbs
diff --git a/src/lib/language/testdata/propertiesblocks.qbs b/src/lib/corelib/language/testdata/propertiesblocks.qbs
index d61f0dd86..d61f0dd86 100644
--- a/src/lib/language/testdata/propertiesblocks.qbs
+++ b/src/lib/corelib/language/testdata/propertiesblocks.qbs
diff --git a/src/lib/language/testdata/propertiesblocks_base.qbs b/src/lib/corelib/language/testdata/propertiesblocks_base.qbs
index 71b09a3da..71b09a3da 100644
--- a/src/lib/language/testdata/propertiesblocks_base.qbs
+++ b/src/lib/corelib/language/testdata/propertiesblocks_base.qbs
diff --git a/src/lib/language/testdata/subdir/pathproperties_base.qbs b/src/lib/corelib/language/testdata/subdir/pathproperties_base.qbs
index 62427169f..62427169f 100644
--- a/src/lib/language/testdata/subdir/pathproperties_base.qbs
+++ b/src/lib/corelib/language/testdata/subdir/pathproperties_base.qbs
diff --git a/src/lib/language/testdata/zort b/src/lib/corelib/language/testdata/zort
index e69de29bb..e69de29bb 100644
--- a/src/lib/language/testdata/zort
+++ b/src/lib/corelib/language/testdata/zort
diff --git a/src/lib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index 373a48583..2308a7aa2 100644
--- a/src/lib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -137,7 +137,7 @@ void TestLanguage::initTestCase()
     m_engine = new ScriptEngine(m_logger, this);
     loader = new Loader(m_engine, m_logger);
     loader->setSearchPaths(QStringList()
-                           << QLatin1String(SRCDIR "/../../share/qbs"));
+                           << QLatin1String(SRCDIR "/../../../share/qbs"));
     QVariantMap buildConfig = defaultParameters.buildConfigurationTree();
     buildConfig.insert("qbs.targetOS", "linux");
     buildConfig.insert("qbs.architecture", "x86_64");
diff --git a/src/lib/language/tst_language.h b/src/lib/corelib/language/tst_language.h
index 7e3ce5df5..7e3ce5df5 100644
--- a/src/lib/language/tst_language.h
+++ b/src/lib/corelib/language/tst_language.h
diff --git a/src/lib/language/value.cpp b/src/lib/corelib/language/value.cpp
index e9b755f2e..e9b755f2e 100644
--- a/src/lib/language/value.cpp
+++ b/src/lib/corelib/language/value.cpp
diff --git a/src/lib/language/value.h b/src/lib/corelib/language/value.h
index 92313a98b..92313a98b 100644
--- a/src/lib/language/value.h
+++ b/src/lib/corelib/language/value.h
diff --git a/src/lib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp
index 118fdf106..118fdf106 100644
--- a/src/lib/logging/ilogsink.cpp
+++ b/src/lib/corelib/logging/ilogsink.cpp
diff --git a/src/lib/logging/ilogsink.h b/src/lib/corelib/logging/ilogsink.h
index 9c263b52d..9c263b52d 100644
--- a/src/lib/logging/ilogsink.h
+++ b/src/lib/corelib/logging/ilogsink.h
diff --git a/src/lib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index 9f7a19c01..9f7a19c01 100644
--- a/src/lib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
diff --git a/src/lib/logging/logger.h b/src/lib/corelib/logging/logger.h
index 1ab11144d..1ab11144d 100644
--- a/src/lib/logging/logger.h
+++ b/src/lib/corelib/logging/logger.h
diff --git a/src/lib/logging/logging.pri b/src/lib/corelib/logging/logging.pri
index 8c0367779..8c0367779 100644
--- a/src/lib/logging/logging.pri
+++ b/src/lib/corelib/logging/logging.pri
diff --git a/src/lib/logging/translator.h b/src/lib/corelib/logging/translator.h
index 5c1f5304b..5c1f5304b 100644
--- a/src/lib/logging/translator.h
+++ b/src/lib/corelib/logging/translator.h
diff --git a/src/lib/parser/parser.pri b/src/lib/corelib/parser/parser.pri
index e6a8a5345..e6a8a5345 100644
--- a/src/lib/parser/parser.pri
+++ b/src/lib/corelib/parser/parser.pri
diff --git a/src/lib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index b94fd1556..b94fd1556 100644
--- a/src/lib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
diff --git a/src/lib/parser/qmlerror.h b/src/lib/corelib/parser/qmlerror.h
index bcc82b483..bcc82b483 100644
--- a/src/lib/parser/qmlerror.h
+++ b/src/lib/corelib/parser/qmlerror.h
diff --git a/src/lib/parser/qmljs.g b/src/lib/corelib/parser/qmljs.g
index a15002857..a15002857 100644
--- a/src/lib/parser/qmljs.g
+++ b/src/lib/corelib/parser/qmljs.g
diff --git a/src/lib/parser/qmljsast.cpp b/src/lib/corelib/parser/qmljsast.cpp
index 3bf7ab968..3bf7ab968 100644
--- a/src/lib/parser/qmljsast.cpp
+++ b/src/lib/corelib/parser/qmljsast.cpp
diff --git a/src/lib/parser/qmljsast_p.h b/src/lib/corelib/parser/qmljsast_p.h
index 3de1dd9f9..3de1dd9f9 100644
--- a/src/lib/parser/qmljsast_p.h
+++ b/src/lib/corelib/parser/qmljsast_p.h
diff --git a/src/lib/parser/qmljsastfwd_p.h b/src/lib/corelib/parser/qmljsastfwd_p.h
index f8dbeb7ad..f8dbeb7ad 100644
--- a/src/lib/parser/qmljsastfwd_p.h
+++ b/src/lib/corelib/parser/qmljsastfwd_p.h
diff --git a/src/lib/parser/qmljsastvisitor.cpp b/src/lib/corelib/parser/qmljsastvisitor.cpp
index 7cec7dcfc..7cec7dcfc 100644
--- a/src/lib/parser/qmljsastvisitor.cpp
+++ b/src/lib/corelib/parser/qmljsastvisitor.cpp
diff --git a/src/lib/parser/qmljsastvisitor_p.h b/src/lib/corelib/parser/qmljsastvisitor_p.h
index 135b07503..135b07503 100644
--- a/src/lib/parser/qmljsastvisitor_p.h
+++ b/src/lib/corelib/parser/qmljsastvisitor_p.h
diff --git a/src/lib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp
index 410de608f..410de608f 100644
--- a/src/lib/parser/qmljsengine_p.cpp
+++ b/src/lib/corelib/parser/qmljsengine_p.cpp
diff --git a/src/lib/parser/qmljsengine_p.h b/src/lib/corelib/parser/qmljsengine_p.h
index 6965e5c20..6965e5c20 100644
--- a/src/lib/parser/qmljsengine_p.h
+++ b/src/lib/corelib/parser/qmljsengine_p.h
diff --git a/src/lib/parser/qmljsglobal_p.h b/src/lib/corelib/parser/qmljsglobal_p.h
index 82b7f092e..82b7f092e 100644
--- a/src/lib/parser/qmljsglobal_p.h
+++ b/src/lib/corelib/parser/qmljsglobal_p.h
diff --git a/src/lib/parser/qmljsgrammar.cpp b/src/lib/corelib/parser/qmljsgrammar.cpp
index 534519fad..534519fad 100644
--- a/src/lib/parser/qmljsgrammar.cpp
+++ b/src/lib/corelib/parser/qmljsgrammar.cpp
diff --git a/src/lib/parser/qmljsgrammar_p.h b/src/lib/corelib/parser/qmljsgrammar_p.h
index 545476e60..545476e60 100644
--- a/src/lib/parser/qmljsgrammar_p.h
+++ b/src/lib/corelib/parser/qmljsgrammar_p.h
diff --git a/src/lib/parser/qmljskeywords_p.h b/src/lib/corelib/parser/qmljskeywords_p.h
index 373d2ad01..373d2ad01 100644
--- a/src/lib/parser/qmljskeywords_p.h
+++ b/src/lib/corelib/parser/qmljskeywords_p.h
diff --git a/src/lib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index 515de2654..515de2654 100644
--- a/src/lib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
diff --git a/src/lib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h
index 692659637..692659637 100644
--- a/src/lib/parser/qmljslexer_p.h
+++ b/src/lib/corelib/parser/qmljslexer_p.h
diff --git a/src/lib/parser/qmljsmemorypool_p.h b/src/lib/corelib/parser/qmljsmemorypool_p.h
index f644cd59d..f644cd59d 100644
--- a/src/lib/parser/qmljsmemorypool_p.h
+++ b/src/lib/corelib/parser/qmljsmemorypool_p.h
diff --git a/src/lib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp
index afd9beeee..afd9beeee 100644
--- a/src/lib/parser/qmljsparser.cpp
+++ b/src/lib/corelib/parser/qmljsparser.cpp
diff --git a/src/lib/parser/qmljsparser_p.h b/src/lib/corelib/parser/qmljsparser_p.h
index 090369fae..090369fae 100644
--- a/src/lib/parser/qmljsparser_p.h
+++ b/src/lib/corelib/parser/qmljsparser_p.h
diff --git a/src/lib/qbs.h b/src/lib/corelib/qbs.h
index 56ae00990..56ae00990 100644
--- a/src/lib/qbs.h
+++ b/src/lib/corelib/qbs.h
diff --git a/src/lib/tools/buildoptions.cpp b/src/lib/corelib/tools/buildoptions.cpp
index 2261124d8..2261124d8 100644
--- a/src/lib/tools/buildoptions.cpp
+++ b/src/lib/corelib/tools/buildoptions.cpp
diff --git a/src/lib/tools/buildoptions.h b/src/lib/corelib/tools/buildoptions.h
index 2c277fc3b..2c277fc3b 100644
--- a/src/lib/tools/buildoptions.h
+++ b/src/lib/corelib/tools/buildoptions.h
diff --git a/src/lib/tools/cleanoptions.cpp b/src/lib/corelib/tools/cleanoptions.cpp
index 359fd47dc..359fd47dc 100644
--- a/src/lib/tools/cleanoptions.cpp
+++ b/src/lib/corelib/tools/cleanoptions.cpp
diff --git a/src/lib/tools/cleanoptions.h b/src/lib/corelib/tools/cleanoptions.h
index 0e3a0a564..0e3a0a564 100644
--- a/src/lib/tools/cleanoptions.h
+++ b/src/lib/corelib/tools/cleanoptions.h
diff --git a/src/lib/tools/codelocation.cpp b/src/lib/corelib/tools/codelocation.cpp
index 70a1814cd..70a1814cd 100644
--- a/src/lib/tools/codelocation.cpp
+++ b/src/lib/corelib/tools/codelocation.cpp
diff --git a/src/lib/tools/codelocation.h b/src/lib/corelib/tools/codelocation.h
index 204192b5a..204192b5a 100644
--- a/src/lib/tools/codelocation.h
+++ b/src/lib/corelib/tools/codelocation.h
diff --git a/src/lib/tools/error.cpp b/src/lib/corelib/tools/error.cpp
index 4bcdc620c..4bcdc620c 100644
--- a/src/lib/tools/error.cpp
+++ b/src/lib/corelib/tools/error.cpp
diff --git a/src/lib/tools/error.h b/src/lib/corelib/tools/error.h
index 3aae9e239..3aae9e239 100644
--- a/src/lib/tools/error.h
+++ b/src/lib/corelib/tools/error.h
diff --git a/src/lib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index 9eca8c2ca..9eca8c2ca 100644
--- a/src/lib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
diff --git a/src/lib/tools/fileinfo.h b/src/lib/corelib/tools/fileinfo.h
index b5731cedd..b5731cedd 100644
--- a/src/lib/tools/fileinfo.h
+++ b/src/lib/corelib/tools/fileinfo.h
diff --git a/src/lib/tools/filetime.h b/src/lib/corelib/tools/filetime.h
index 0dc0524df..0dc0524df 100644
--- a/src/lib/tools/filetime.h
+++ b/src/lib/corelib/tools/filetime.h
diff --git a/src/lib/tools/filetime_unix.cpp b/src/lib/corelib/tools/filetime_unix.cpp
index 945be8f44..945be8f44 100644
--- a/src/lib/tools/filetime_unix.cpp
+++ b/src/lib/corelib/tools/filetime_unix.cpp
diff --git a/src/lib/tools/filetime_win.cpp b/src/lib/corelib/tools/filetime_win.cpp
index b3a7fab67..b3a7fab67 100644
--- a/src/lib/tools/filetime_win.cpp
+++ b/src/lib/corelib/tools/filetime_win.cpp
diff --git a/src/lib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h
index 0bf05cbfd..0bf05cbfd 100644
--- a/src/lib/tools/hostosinfo.h
+++ b/src/lib/corelib/tools/hostosinfo.h
diff --git a/src/lib/tools/id.cpp b/src/lib/corelib/tools/id.cpp
index a9dc07cbc..a9dc07cbc 100644
--- a/src/lib/tools/id.cpp
+++ b/src/lib/corelib/tools/id.cpp
diff --git a/src/lib/tools/id.h b/src/lib/corelib/tools/id.h
index 097a2d89b..097a2d89b 100644
--- a/src/lib/tools/id.h
+++ b/src/lib/corelib/tools/id.h
diff --git a/src/lib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp
index 66e82fd23..66e82fd23 100644
--- a/src/lib/tools/installoptions.cpp
+++ b/src/lib/corelib/tools/installoptions.cpp
diff --git a/src/lib/tools/installoptions.h b/src/lib/corelib/tools/installoptions.h
index 2b6194fb0..2b6194fb0 100644
--- a/src/lib/tools/installoptions.h
+++ b/src/lib/corelib/tools/installoptions.h
diff --git a/src/lib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index aa519cab2..aa519cab2 100644
--- a/src/lib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
diff --git a/src/lib/tools/persistence.h b/src/lib/corelib/tools/persistence.h
index 1afea6d80..1afea6d80 100644
--- a/src/lib/tools/persistence.h
+++ b/src/lib/corelib/tools/persistence.h
diff --git a/src/lib/tools/persistentobject.h b/src/lib/corelib/tools/persistentobject.h
index 0d9b588c0..0d9b588c0 100644
--- a/src/lib/tools/persistentobject.h
+++ b/src/lib/corelib/tools/persistentobject.h
diff --git a/src/lib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp
index bdff7c67b..bdff7c67b 100644
--- a/src/lib/tools/preferences.cpp
+++ b/src/lib/corelib/tools/preferences.cpp
diff --git a/src/lib/tools/preferences.h b/src/lib/corelib/tools/preferences.h
index e5e6c9bb6..e5e6c9bb6 100644
--- a/src/lib/tools/preferences.h
+++ b/src/lib/corelib/tools/preferences.h
diff --git a/src/lib/tools/processresult.cpp b/src/lib/corelib/tools/processresult.cpp
index 885d7ffee..885d7ffee 100644
--- a/src/lib/tools/processresult.cpp
+++ b/src/lib/corelib/tools/processresult.cpp
diff --git a/src/lib/tools/processresult.h b/src/lib/corelib/tools/processresult.h
index b8de9ddd2..b8de9ddd2 100644
--- a/src/lib/tools/processresult.h
+++ b/src/lib/corelib/tools/processresult.h
diff --git a/src/lib/tools/processresult_p.h b/src/lib/corelib/tools/processresult_p.h
index db2475b44..db2475b44 100644
--- a/src/lib/tools/processresult_p.h
+++ b/src/lib/corelib/tools/processresult_p.h
diff --git a/src/lib/tools/profile.cpp b/src/lib/corelib/tools/profile.cpp
index cb3186ae4..cb3186ae4 100644
--- a/src/lib/tools/profile.cpp
+++ b/src/lib/corelib/tools/profile.cpp
diff --git a/src/lib/tools/profile.h b/src/lib/corelib/tools/profile.h
index c3b0bbfe8..c3b0bbfe8 100644
--- a/src/lib/tools/profile.h
+++ b/src/lib/corelib/tools/profile.h
diff --git a/src/lib/tools/progressobserver.cpp b/src/lib/corelib/tools/progressobserver.cpp
index f18aefcfb..f18aefcfb 100644
--- a/src/lib/tools/progressobserver.cpp
+++ b/src/lib/corelib/tools/progressobserver.cpp
diff --git a/src/lib/tools/progressobserver.h b/src/lib/corelib/tools/progressobserver.h
index 66d552a02..66d552a02 100644
--- a/src/lib/tools/progressobserver.h
+++ b/src/lib/corelib/tools/progressobserver.h
diff --git a/src/lib/tools/propertyfinder.cpp b/src/lib/corelib/tools/propertyfinder.cpp
index 96c081f01..96c081f01 100644
--- a/src/lib/tools/propertyfinder.cpp
+++ b/src/lib/corelib/tools/propertyfinder.cpp
diff --git a/src/lib/tools/propertyfinder.h b/src/lib/corelib/tools/propertyfinder.h
index 0db0ba39f..0db0ba39f 100644
--- a/src/lib/tools/propertyfinder.h
+++ b/src/lib/corelib/tools/propertyfinder.h
diff --git a/src/lib/tools/qbs_export.h b/src/lib/corelib/tools/qbs_export.h
index da6779088..da6779088 100644
--- a/src/lib/tools/qbs_export.h
+++ b/src/lib/corelib/tools/qbs_export.h
diff --git a/src/lib/tools/qbsassert.cpp b/src/lib/corelib/tools/qbsassert.cpp
index 46ea58b83..46ea58b83 100644
--- a/src/lib/tools/qbsassert.cpp
+++ b/src/lib/corelib/tools/qbsassert.cpp
diff --git a/src/lib/tools/qbsassert.h b/src/lib/corelib/tools/qbsassert.h
index 25c00ae1a..25c00ae1a 100644
--- a/src/lib/tools/qbsassert.h
+++ b/src/lib/corelib/tools/qbsassert.h
diff --git a/src/lib/tools/qttools.cpp b/src/lib/corelib/tools/qttools.cpp
index 21fef9b8f..21fef9b8f 100644
--- a/src/lib/tools/qttools.cpp
+++ b/src/lib/corelib/tools/qttools.cpp
diff --git a/src/lib/tools/qttools.h b/src/lib/corelib/tools/qttools.h
index bef545c0e..bef545c0e 100644
--- a/src/lib/tools/qttools.h
+++ b/src/lib/corelib/tools/qttools.h
diff --git a/src/lib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index 3c5dad702..3c5dad702 100644
--- a/src/lib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
diff --git a/src/lib/tools/scannerpluginmanager.h b/src/lib/corelib/tools/scannerpluginmanager.h
index ce1ab2d2d..ce1ab2d2d 100644
--- a/src/lib/tools/scannerpluginmanager.h
+++ b/src/lib/corelib/tools/scannerpluginmanager.h
diff --git a/src/lib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp
index c87898da5..c87898da5 100644
--- a/src/lib/tools/scripttools.cpp
+++ b/src/lib/corelib/tools/scripttools.cpp
diff --git a/src/lib/tools/scripttools.h b/src/lib/corelib/tools/scripttools.h
index 4230c898c..4230c898c 100644
--- a/src/lib/tools/scripttools.h
+++ b/src/lib/corelib/tools/scripttools.h
diff --git a/src/lib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp
index 95d27ba24..95d27ba24 100644
--- a/src/lib/tools/settings.cpp
+++ b/src/lib/corelib/tools/settings.cpp
diff --git a/src/lib/tools/settings.h b/src/lib/corelib/tools/settings.h
index 2542df4fb..2542df4fb 100644
--- a/src/lib/tools/settings.h
+++ b/src/lib/corelib/tools/settings.h
diff --git a/src/lib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index c3b00f3c4..c3b00f3c4 100644
--- a/src/lib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
diff --git a/src/lib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h
index d6d8bf88c..d6d8bf88c 100644
--- a/src/lib/tools/setupprojectparameters.h
+++ b/src/lib/corelib/tools/setupprojectparameters.h
diff --git a/src/lib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
index fca3d8f4b..fca3d8f4b 100644
--- a/src/lib/tools/tools.pri
+++ b/src/lib/corelib/tools/tools.pri
diff --git a/src/lib/tools/tst_tools.cpp b/src/lib/corelib/tools/tst_tools.cpp
index c1af58f70..c1af58f70 100644
--- a/src/lib/tools/tst_tools.cpp
+++ b/src/lib/corelib/tools/tst_tools.cpp
diff --git a/src/lib/tools/tst_tools.h b/src/lib/corelib/tools/tst_tools.h
index c7168a686..c7168a686 100644
--- a/src/lib/tools/tst_tools.h
+++ b/src/lib/corelib/tools/tst_tools.h
diff --git a/src/lib/tools/weakpointer.h b/src/lib/corelib/tools/weakpointer.h
index 3da1abd6d..3da1abd6d 100644
--- a/src/lib/tools/weakpointer.h
+++ b/src/lib/corelib/tools/weakpointer.h
diff --git a/src/lib/use.pri b/src/lib/corelib/use_corelib.pri
index 26442fe76..875c51f51 100644
--- a/src/lib/use.pri
+++ b/src/lib/corelib/use_corelib.pri
@@ -1,4 +1,4 @@
-include(../../qbs_version.pri)
+include(../../../qbs_version.pri)
 
 isEmpty(QBSLIBDIR) {
     QBSLIBDIR = $$OUT_PWD/../../../lib
diff --git a/src/lib/use_installed.pri b/src/lib/corelib/use_installed_corelib.pri
index c3b1dd5af..bac8d6da7 100644
--- a/src/lib/use_installed.pri
+++ b/src/lib/corelib/use_installed_corelib.pri
@@ -31,7 +31,7 @@ win32 {
     LIBS += $$QBSCORELIB
 }
 
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $${PWD} $${PWD}/..
 
 CONFIG(static, static|shared) {
     DEFINES += QBS_STATIC_LIB
diff --git a/src/lib/lib.pro b/src/lib/library.pri
index 27dee1c39..85ea9ca28 100644
--- a/src/lib/lib.pro
+++ b/src/lib/library.pri
@@ -1,26 +1,16 @@
-QT = core script gui
-all_tests:QT += testlib
-
 TEMPLATE = lib
+QT = core
 !isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR}
-else:DLLDESTDIR = ../../bin
+else:DLLDESTDIR = ../../../bin
 !isEmpty(QBS_DESTDIR):DESTDIR = $${QBS_DESTDIR}
-else:DESTDIR = ../../lib
-INCLUDEPATH += $$PWD
-TARGET = qbscore
-
-CONFIG += depend_includepath
-DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB      # needed for QmlJS
-
+else:DESTDIR = ../../../lib
 CONFIG(static, static|shared) {
     DEFINES += QBS_STATIC_LIB
 } else {
     DEFINES += QBS_LIBRARY
 }
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+INCLUDEPATH += $${PWD}/../
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
 win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d
 win32-msvc*|win32-icc:QMAKE_CXXFLAGS += /WX
 else:*g++*|*clang*|*icc*:QMAKE_CXXFLAGS += -Werror
@@ -28,26 +18,12 @@ else:*g++*|*clang*|*icc*:QMAKE_CXXFLAGS += -Werror
 !disable_rpath {
     macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 }
-
 include(../../qbs_version.pri)
 VERSION = $${QBS_VERSION}
-
-include(api/api.pri)
-include(buildgraph/buildgraph.pri)
-include(jsextensions/jsextensions.pri)
-include(language/language.pri)
-include(logging/logging.pri)
-include(parser/parser.pri)
-include(tools/tools.pri)
-
-HEADERS += \
-    qbs.h
-
 win32 {
     dlltarget.path = $${QBS_INSTALL_PREFIX}/bin
     INSTALLS += dlltarget
 }
-
 !win32|!qbs_no_dev_install {
     !isEmpty(QBS_LIB_INSTALL_DIR): \
         target.path = $${QBS_LIB_INSTALL_DIR}
@@ -56,10 +32,3 @@ win32 {
     INSTALLS += target
 }
 
-!qbs_no_dev_install {
-    qbs_h.files = qbs.h
-    qbs_h.path = $${QBS_INSTALL_PREFIX}/include/qbs
-    use_pri.files = use_installed.pri ../../qbs_version.pri
-    use_pri.path = $${qbs_h.path}
-    INSTALLS += qbs_h use_pri
-}
diff --git a/src/lib/libs.qbs b/src/lib/libs.qbs
new file mode 100644
index 000000000..e31dd463d
--- /dev/null
+++ b/src/lib/libs.qbs
@@ -0,0 +1,8 @@
+import qbs
+
+Project {
+    references: [
+        "corelib/corelib.qbs",
+        "qtprofilesetup/qtprofilesetup.qbs",
+    ]
+}
diff --git a/src/app/qbs-setup-qt/setupqtprofile.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 4782e0b8f..0bc19d124 100644
--- a/src/app/qbs-setup-qt/setupqtprofile.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "setupqtprofile.h"
+#include "qtprofilesetup.h"
 
 #include <logging/translator.h>
 #include <tools/error.h>
diff --git a/src/app/qbs-setup-qt/setupqtprofile.h b/src/lib/qtprofilesetup/qtprofilesetup.h
index a65c922fc..8d2e04568 100644
--- a/src/app/qbs-setup-qt/setupqtprofile.h
+++ b/src/lib/qtprofilesetup/qtprofilesetup.h
@@ -29,13 +29,15 @@
 #ifndef QBS_SETUPQTPROFILE_H
 #define QBS_SETUPQTPROFILE_H
 
+#include <tools/qbs_export.h>
+
 #include <QStringList>
 
 namespace qbs {
 class ErrorInfo;
 class Settings;
 
-class QtEnvironment {
+class QBS_EXPORT QtEnvironment {
 public:
     QString installPrefixPath;
     QString libraryPath;
@@ -61,8 +63,8 @@ public:
     bool staticBuild;
 };
 
-ErrorInfo setupQtProfile(const QString &profileName, Settings *settings,
-                         const QtEnvironment &qtEnvironment);
+QBS_EXPORT ErrorInfo setupQtProfile(const QString &profileName, Settings *settings,
+                                    const QtEnvironment &qtEnvironment);
 
 } // namespace qbs
 
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.pro b/src/lib/qtprofilesetup/qtprofilesetup.pro
new file mode 100644
index 000000000..cedb66e2a
--- /dev/null
+++ b/src/lib/qtprofilesetup/qtprofilesetup.pro
@@ -0,0 +1,14 @@
+TARGET = qbsqtprofilesetup
+include(../library.pri)
+include(../corelib/use_corelib.pri)
+
+HEADERS = qtprofilesetup.h
+SOURCES = qtprofilesetup.cpp
+
+!qbs_no_dev_install {
+    header.files = qtprofilesetup.h
+    header.path = $${QBS_INSTALL_PREFIX}/include/qbs
+    use_pri.files = use_installed_qtprofilesetup.pri
+    use_pri.path = $${header.path}
+    INSTALLS += header use_pri
+}
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.qbs b/src/lib/qtprofilesetup/qtprofilesetup.qbs
new file mode 100644
index 000000000..59d2595c3
--- /dev/null
+++ b/src/lib/qtprofilesetup/qtprofilesetup.qbs
@@ -0,0 +1,23 @@
+import qbs
+import "../Library.qbs" as QbsLibrary
+
+QbsLibrary {
+    name: "qbsqtprofilesetup"
+    Depends { name: "qbscore" }
+
+    Group {
+        name: "Public API headers"
+        files: [
+            "qtprofilesetup.h",
+            "use_installed_qtprofilesetup.pri",
+        ]
+        qbs.install: project.installApiHeaders
+        qbs.installDir: headerInstallPrefix
+    }
+
+    files: "qtprofilesetup.cpp"
+
+    Export {
+        Depends { name: "qbscore" }
+    }
+}
diff --git a/src/lib/qtprofilesetup/use_installed_qtprofilesetup.pri b/src/lib/qtprofilesetup/use_installed_qtprofilesetup.pri
new file mode 100644
index 000000000..ee39dc344
--- /dev/null
+++ b/src/lib/qtprofilesetup/use_installed_qtprofilesetup.pri
@@ -0,0 +1,20 @@
+include(use_installed_corelib.pri)
+
+LIBNAME=qbsqtprofilesetup
+
+unix:LIBS += -l$${LIBNAME}
+
+win32 {
+    CONFIG(debug, debug|release) {
+        QBSQTPROFILELIB = $${LIBNAME}$$d{QBSCORELIBSUFFIX}
+    }
+    CONFIG(release, debug|release) {
+        QBSQTPROFILELIB = $${LIBNAME}$${QBSCORELIBSUFFIX}
+    }
+    win32-msvc* {
+        QBSQTPROFILELIB = $${QBSQTPROFILELIB}.lib
+    } else {
+        QBSQTPROFILELIB = lib$${QBSQTPROFILELIB}
+    }
+    LIBS += $${QBSQTPROFILELIB}
+}
diff --git a/src/lib/qtprofilesetup/use_qtprofilesetup.pri b/src/lib/qtprofilesetup/use_qtprofilesetup.pri
new file mode 100644
index 000000000..9ed5ad033
--- /dev/null
+++ b/src/lib/qtprofilesetup/use_qtprofilesetup.pri
@@ -0,0 +1,47 @@
+include(../../../qbs_version.pri)
+
+isEmpty(QBSLIBDIR) {
+    QBSLIBDIR = $${OUT_PWD}/../../../lib
+}
+
+LIBNAME=qbsqtprofilesetup
+
+unix {
+    LIBS += -L$${QBSLIBDIR} -l$${LIBNAME}
+}
+
+!disable_rpath {
+    linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/../lib\'
+    macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../lib
+}
+
+!CONFIG(static, static|shared) {
+    QBSQTPROFILELIBSUFFIX = $${QBS_VERSION_MAJ}
+}
+
+win32 {
+    CONFIG(debug, debug|release) {
+        QBSQTPROFILELIB = $${LIBNAME}d$${QBSQTPROFILELIBSUFFIX}
+    }
+    CONFIG(release, debug|release) {
+        QBSQTPROFILELIB = $${LIBNAME}$${QBSQTPROFILELIBSUFFIX}
+    }
+    win32-msvc* {
+        LIBS += /LIBPATH:$$QBSLIBDIR
+        QBSQTPROFILELIB = $${QBSQTPROFILELIB}.lib
+        LIBS += Shell32.lib
+    } else {
+        LIBS += -L$${QBSLIBDIR}
+        QBSQTPROFILELIB = lib$${QBSQTPROFILELIB}
+    }
+    LIBS += $${QBSQTPROFILELIB}
+}
+
+INCLUDEPATH += \
+    $$PWD
+
+CONFIG += depend_includepath
+
+CONFIG(static, static|shared) {
+    DEFINES += QBS_STATIC_LIB
+}
diff --git a/src/src.qbs b/src/src.qbs
index b377b6b77..04ce2d6ba 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -3,7 +3,7 @@ import qbs
 Project {
     references: [
         "app/apps.qbs",
-        "lib/lib.qbs",
+        "lib/libs.qbs",
         "plugins/plugins.qbs"
     ]
 }
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 4404031fc..577c1a7f6 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -29,7 +29,7 @@
 
 #include "tst_api.h"
 
-#include "../../src/app/shared/qbssettings.h"
+#include "../../../src/app/shared/qbssettings.h"
 
 #include <api/jobs.h>
 #include <api/project.h>
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri
index 79330e3ad..979efe8ad 100644
--- a/tests/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -8,4 +8,4 @@ CONFIG += depend_includepath testcase console
 CONFIG -= app_bundle
 target.CONFIG += no_default_install
 
-include(../../src/lib/use.pri)
+include(../../src/lib/corelib/use_corelib.pri)