From 0b41e3958e9c7565dc4e01a5d9beb0ef44e1eea3 Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Sat, 9 Nov 2013 19:44:13 +0200
Subject: [PATCH] Revert "fix missing conf.pri error". The WARNING message
 during configure is harmless. The file is found during make. Closes #1042.

This reverts commit 807f1cfb9437b2095a75fdd0e1723d1c2cd965dd.
---
 unixconf.pri | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixconf.pri b/unixconf.pri
index f75af586b..2126c52dd 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -1,5 +1,7 @@
 # Generated by the configure file
-include(conf.pri)
+# 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)
 
 # COMPILATION SPECIFIC
 !nox:dbus {