Skip to content

Commit 2dc7708

Browse files
Improve detection of conf.pri.
1 parent 8d04b04 commit 2dc7708

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

unixconf.pri

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Generated by the configure file
2-
# There will be a WARNING during configure that this file wasn't found.
3-
# This is harmless. During make the file will be found. If not, there will a WARNING again.
4-
include($$OUT_PWD/../conf.pri)
2+
# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
3+
# If not there will be a WARNING again.
4+
# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
5+
# The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
6+
exists($$OUT_PWD/../conf.pri) {
7+
include($$OUT_PWD/../conf.pri)
8+
} else {
9+
include(conf.pri)
10+
}
511

612
# COMPILATION SPECIFIC
713
!nox:dbus {

0 commit comments

Comments
 (0)