Permalink
Browse files

Improve detection of conf.pri.

  • Loading branch information...
sledgehammer999 committed Nov 19, 2013
1 parent 4ac1f7b commit 2d130bfa85fb21c89362ea77e022fb6602ac4d2e
Showing with 9 additions and 3 deletions.
  1. +9 −3 unixconf.pri
View
@@ -1,7 +1,13 @@
# Generated by the configure file
-# There will be a WARNING during configure that this file wasn't found.
-# This is harmless. During make the file will be found. If not, there will a WARNING again.
-include($$OUT_PWD/../conf.pri)
+# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
+# If not there will be a WARNING again.
+# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
+# The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
+exists($$OUT_PWD/../conf.pri) {
+ include($$OUT_PWD/../conf.pri)
+} else {
+ include(conf.pri)
+}
# COMPILATION SPECIFIC
!nox:dbus {

0 comments on commit 2d130bf

Please sign in to comment.