diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-12-03 10:56:08 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-05 15:41:24 +0100 |
| commit | 8d536f021db8cf46584af3e0bc6ab6f64125171e (patch) | |
| tree | 8d3f50e5b71e36b6820384d78006f05a6eda519b | |
| parent | aba4f72df71a406c04a065ceaf2f3d2ea8b9edbb (diff) | |
Do not tolerate compiler warnings.
This is especially useful for the test machines, as they
might emit warnings we would otherwise miss.
Change-Id: Id86c724ab250c0e5329de4b22b5c82b759f4fa9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/api/project.cpp | 4 | ||||
| -rw-r--r-- | src/lib/buildgraph/executor.cpp | 3 | ||||
| -rw-r--r-- | src/lib/lib.pro | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/api/project.cpp b/src/lib/api/project.cpp index 586aa7507..61757712c 100644 --- a/src/lib/api/project.cpp +++ b/src/lib/api/project.cpp @@ -150,7 +150,9 @@ static QVariantMap expandedBuildConfiguration(const QVariantMap &userBuildConfig if (nameElements.count() == 1 && nameElements.first() != "project") // ### Still need this because platform doesn't supply fully-qualified properties (yet), need to fix this nameElements.prepend("qbs"); if (nameElements.count() > 2) { // ### workaround for submodules being represented internally as a single module of name "module/submodule" rather than two nested modules "module" and "submodule" - QStringList newElements(QStringList(nameElements.mid(0, nameElements.count()-1)).join("/")); + QStringList allButLast = nameElements; + allButLast.removeLast(); + QStringList newElements(allButLast.join("/")); newElements.append(nameElements.last()); nameElements = newElements; } diff --git a/src/lib/buildgraph/executor.cpp b/src/lib/buildgraph/executor.cpp index ec5f338da..a3006b37f 100644 --- a/src/lib/buildgraph/executor.cpp +++ b/src/lib/buildgraph/executor.cpp @@ -568,9 +568,8 @@ void Executor::setupProgressObserver(bool mocWillRun) void Executor::doSanityChecks() { Q_ASSERT(!m_productsToBuild.isEmpty()); - BuildProject * const p = m_productsToBuild.first()->project; for (int i = 1; i < m_productsToBuild.count(); ++i) - Q_ASSERT(m_productsToBuild.at(i)->project == p); + Q_ASSERT(m_productsToBuild.at(i)->project == m_productsToBuild.first()->project); } void Executor::addExecutorJobs(int jobNumber) diff --git a/src/lib/lib.pro b/src/lib/lib.pro index f157d96ca..be1420355 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -9,6 +9,8 @@ CONFIG += static depend_includepath DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB # needed for QmlJS win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d +win32-msvc*|win32-icc:QMAKE_CXXFLAGS += /WX +else:*g++*|*clang*|*icc*:QMAKE_CXXFLAGS += -Werror include(../../qbs_version.pri) include(api/api.pri) |