Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improve detection of conf.pri.

  • Loading branch information...
commit 2d130bfa85fb21c89362ea77e022fb6602ac4d2e 1 parent 4ac1f7b
@sledgehammer999 sledgehammer999 authored
Showing with 9 additions and 3 deletions.
  1. +9 −3 unixconf.pri
View
12 unixconf.pri
@@ -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 {
Please sign in to comment.
Something went wrong with that request. Please try again.