Merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ubuntu-packaging-flags-clean-up into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Cleaned up qmake Ubuntu packaging variables.

The qtbase packaging for Ubuntu exports the CFLAGS, CXXFLAGS and LFLAGS variables in the environment before running configure so that the qtbase shared libraries can be compiled with the required distribution defined compiler flags. That is fine (though I guess that could be handled better at the qtbase packaging level with maybe a dedicated prf) but it results in qt_build_config.prf defining the QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS variables with these distribution specific flags. Since we load this prf, these variables end up being defined when building the toolkit for development purpose. This is problematic because -O2 and -g are always defined (whatever the debug or release config chosen by the developer), also these are GCC specific flags which makes our build break with other compilers. This is also ugly because preprocessor defines are directly set in the QMAKE_C*FLAGS. In order to workaround these issues, we unset these variables and set the different flags apart from -g and -O2 in the right qmake variables. This allows to keep compiling with the Debian flags but in a more flexible way. For the Debian packaging, we keep the former behaviour by simply passing the debian_build config.

Cleaned up qmake Ubuntu packaging variables.

The qtbase packaging for Ubuntu exports the CFLAGS, CXXFLAGS and LFLAGS variables in the environment before running configure so that the qtbase shared libraries can be compiled with the required distribution defined compiler flags. That is fine (though I guess that could be handled better at the qtbase packaging level with maybe a dedicated prf) but it results in qt_build_config.prf defining the QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS variables with these distribution specific flags. Since we load this prf, these variables end up being defined when building the toolkit for development purpose. This is problematic because -O2 and -g are always defined (whatever the debug or release config chosen by the developer), also these are GCC specific flags which makes our build break with other compilers. This is also ugly because preprocessor defines are directly set in the QMAKE_C*FLAGS. In order to workaround these issues, we unset these variables and set the different flags apart from -g and -O2 in the right qmake variables. This allows to keep compiling with the Debian flags but in a more flexible way. For the Debian packaging, we keep the former behaviour by simply passing the debian_build config.

Here are the flags for the toolkit libs:

qmake CONFIG=release
CXXFLAGS = -fstack-protector -Werror -O2 -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden -pthread -fno-exceptions -Wall -W -Wsuggest-override -Wdate-time -Wformat -Werror=format-security -D_REENTRANT -fPIC $(DEFINES)
LFLAGS = -Wl,--no-undefined -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -shared -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-soname,libUbuntuToolkit.so.5

qmake CONFIG+=debug
CXXFLAGS = -fstack-protector -Werror -g -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden -pthread -fno-exceptions -Wall -W -Wsuggest-override -Wdate-time -Wformat -Werror=format-security -D_REENTRANT -fPIC $(DEFINES)
LFLAGS = -Wl,--no-undefined -fuse-ld=gold -Wl,--enable-new-dtags -shared -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-soname,libUbuntuToolkit.so.5

qmake CONFIG+=debian_build
CXXFLAGS = -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -O2 -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden -pthread -fno-exceptions -Wall -W -Wsuggest-override -D_REENTRANT -fPIC $(DEFINES)
LFLAGS = -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -shared -Wl,-Bsymbolic-functions -Wl,-soname,libUbuntuToolkit.so.5

[Loïc Molinari (loic.molinari)]

I've got a MR almost ready to share the common stuff for C++ libs and QML plugins.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1192/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6322/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1192/rebuild

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

The MR to share the common stuff is there https://code.launchpad.net/~loic.molinari/ubuntu-ui-toolkit/uitk-added-ubuntu-common-prf/+merge/305847

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1408/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6330/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1408/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1158/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6331/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1158/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1401/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6332/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1401/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/752/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1401
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1401/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1408
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1192
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1158
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6333/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6332
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6330
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6322
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6331

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/752/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good to me, let's see Benjamin's verdict.

review: Approve

[Benjamin Zeller (zeller-benjamin)]

Nice work! Looks good to me too!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1459/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6564/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1459/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1243/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6568/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1243/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/23/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6571/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/23/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1209/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6573/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1209/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1452/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6580/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1452/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/538/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1452
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1452/artifact/artifacts/*zip*/artifacts.zip
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1459/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1243/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1209/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/23/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/829/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6580
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6564
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6568
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6573
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6571

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1212/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6592/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1212/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1246/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6593/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1246/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/26/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6594/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/26/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1462/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6595/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1462/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2105
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1455/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6596/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1455/rebuild

review: Approve (continuous-integration)

=== modified file '.qmake.conf'
--- .qmake.conf	2016-09-13 14:01:32 +0000
+++ .qmake.conf	2016-09-15 14:57:04 +0000
@@ -14,11 +14,11 @@
 ROOT_BUILD_DIR=$$shadowed($$PWD)
 
 exists($$PWD/../qt.pro) {
-    CONFIG += build_with_qt
+    CONFIG += qt_submodule_build
 } else {
     # When built as a Qt submodule, -Wsuggest-override breaks the build. That's
     # fixed in Qt 5.6. See https://codereview.qt-project.org/#/c/169969/
-    gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS += -Wsuggest-override
+    gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
 }
 
 # FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.

=== modified file 'debian/rules'
--- debian/rules	2016-09-15 14:51:50 +0000
+++ debian/rules	2016-09-15 14:57:04 +0000
@@ -16,7 +16,7 @@
 testskip_series := yakkety xenial
 
 override_dh_auto_configure:
-	qmake -r
+	qmake -r CONFIG+=debian_build
 
 %:
 	dh $@ --parallel

=== modified file 'documentation/documentation.pro'
--- documentation/documentation.pro	2015-08-13 09:20:05 +0000
+++ documentation/documentation.pro	2016-09-15 14:57:04 +0000
@@ -17,7 +17,7 @@
 generate_docs.commands = cd $$ROOT_SOURCE_DIR; SRC=$$ROOT_SOURCE_DIR/documentation BLD=$$ROOT_BUILD_DIR/documentation $$ROOT_SOURCE_DIR/documentation/docs.sh \'$$QDOC\' \'$$QHELPGENERATOR\' $$DOC_PATH
 
 #install the online docs only when building outside of Qt
-!build_with_qt{
+!qt_submodule_build{
     install_docs.files = $$shadowed($$ROOT_SOURCE_DIR)/documentation/html
     install_docs.path = /usr/share/ubuntu-ui-toolkit/doc
     install_docs.CONFIG += no_check_exist directory no_build

=== modified file 'features/ubuntu_enable_testing.prf'
--- features/ubuntu_enable_testing.prf	2015-08-13 09:20:05 +0000
+++ features/ubuntu_enable_testing.prf	2016-09-15 14:57:04 +0000
@@ -1,6 +1,6 @@
 instbase = $$ROOT_BUILD_DIR/qml
 
-!build_with_qt {
+!qt_submodule_build {
     # These bizarre rules copy the files to the build directory
 
     defineReplace(qmlModStripSrcDir) {

=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2016-06-17 13:42:23 +0000
+++ features/ubuntu_qml_plugin.prf	2016-09-15 14:57:04 +0000
@@ -1,3 +1,28 @@
+# The qtbase packaging for Ubuntu exports the CFLAGS, CXXFLAGS and LFLAGS
+# variables in the environment before running configure so that the qtbase
+# shared libraries can be compiled with the required distribution defined
+# compiler flags. That is fine (though I guess that could be handled better at
+# the qtbase packaging level with maybe a dedicated prf) but it results in
+# qt_build_config.prf defining the QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS
+# variables with these distribution specific flags. Since we load this prf,
+# these variables end up being defined when building the toolkit for development
+# purpose. This is problematic because -O2 and -g are always defined (whatever
+# the debug or release config chosen by the developer), also these are GCC
+# specific flags which makes our build break with other compilers. This is also
+# ugly because preprocessor defines are directly set in the QMAKE_C*FLAGS. In
+# order to workaround these issues, we unset these variables and set the
+# different flags apart from -g and -O2 in the right qmake variables. This
+# allows to keep compiling with the Debian flags but in a more flexible way.
+gcc:!qt_submodule_build:!debian_build {
+    QMAKE_CFLAGS = -fstack-protector
+    QMAKE_CXXFLAGS = -fstack-protector
+    QMAKE_LFLAGS =
+    QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
+    QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
+    DEFINES += _FORTIFY_SOURCE=2
+    unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
+}
+
 load(qml_plugin)
 CONFIG -= hide_symbols
 
@@ -5,7 +30,7 @@
 
 #hacky hacks to build the qmltypes
 
-!build_with_qt{
+!qt_submodule_build {
     #should be already set by the qml_plugin.prf, but lets be safe
     isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION")
 
@@ -71,15 +96,6 @@
     QMAKE_EXTRA_TARGETS += autobld_qmltypes
 }
 
-# when building against the system Qt we pick up the CXX_FLAGS for a release build
-# reset them to the default debug build flags
-!build_with_qt: {
-    CONFIG(debug, debug|release)  {
-        QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
-        QMAKE_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
-    }
-}
-
 QMAKE_CXXFLAGS += -Werror
 
 #do not warn for deprecated declarations

=== modified file 'features/ubuntu_qt_module.prf'
--- features/ubuntu_qt_module.prf	2016-09-12 08:18:53 +0000
+++ features/ubuntu_qt_module.prf	2016-09-15 14:57:04 +0000
@@ -1,3 +1,28 @@
+# The qtbase packaging for Ubuntu exports the CFLAGS, CXXFLAGS and LFLAGS
+# variables in the environment before running configure so that the qtbase
+# shared libraries can be compiled with the required distribution defined
+# compiler flags. That is fine (though I guess that could be handled better at
+# the qtbase packaging level with maybe a dedicated prf) but it results in
+# qt_build_config.prf defining the QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS
+# variables with these distribution specific flags. Since we load this prf,
+# these variables end up being defined when building the toolkit for development
+# purpose. This is problematic because -O2 and -g are always defined (whatever
+# the debug or release config chosen by the developer), also these are GCC
+# specific flags which makes our build break with other compilers. This is also
+# ugly because preprocessor defines are directly set in the QMAKE_C*FLAGS. In
+# order to workaround these issues, we unset these variables and set the
+# different flags apart from -g and -O2 in the right qmake variables. This
+# allows to keep compiling with the Debian flags but in a more flexible way.
+gcc:!qt_submodule_build:!debian_build {
+    QMAKE_CFLAGS = -fstack-protector
+    QMAKE_CXXFLAGS = -fstack-protector
+    QMAKE_LFLAGS =
+    QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
+    QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
+    DEFINES += _FORTIFY_SOURCE=2
+    unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
+}
+
 # Enables the copy of private and public headers to an include directory at the
 # root of the sources before compilation and the copy of the compiled libraries
 # after compilation. Must be set before loading qt_module.
@@ -11,15 +36,6 @@
 # Common config options.
 CONFIG += dll no_keywords c++11
 
-# When building against the system Qt we pick up the CXX_FLAGS for a release
-# build reset them to the default debug build flags.
-!build_with_qt: {
-    CONFIG(debug, debug|release)  {
-        QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
-        QMAKE_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
-    }
-}
-
 # Make all warnings into errors.
 QMAKE_CXXFLAGS += -Werror