← Back to branch summary

~aacid/ubuntu-ui-toolkit/save_stat_loading_already_loaded_image

« back to all changes in this revision

Viewing changes to .qmake.conf

  • Committer: Loïc Molinari
  • Date: 2016-09-15 15:25:54 UTC
  • mto: (2116.1.1 uitk-staging)
  • mto: This revision was merged to the branch mainline in revision 2120.
  • Revision ID: loic.molinari@canonical.com-20160915152554-zarbbk3x77myz7br
Moved common config flags to ubuntu_common.prf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.qmake.conf
10
10
 
11
11
MODULE_VERSION = 5.5.0
12
12
 
13
 
ROOT_SOURCE_DIR=$$PWD
14
 
ROOT_BUILD_DIR=$$shadowed($$PWD)
 
13
ROOT_SOURCE_DIR = $$PWD
 
14
ROOT_BUILD_DIR = $$shadowed($$PWD)
15
15
 
16
 
exists($$PWD/../qt.pro) {
17
 
    CONFIG += qt_submodule_build
18
 
} else {
19
 
    # When built as a Qt submodule, -Wsuggest-override breaks the build. That's
20
 
    # fixed in Qt 5.6. See https://codereview.qt-project.org/#/c/169969/
21
 
    gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
22
 
}
 
16
exists($$PWD/../qt.pro): CONFIG += qt_submodule_build
23
17
 
24
18
# FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
25
19
# build UbuntuToolkit without namespace