mirror of https://gitlab.com/ita1024/waf.git
Issue 1726
This commit is contained in:
parent
5a35d6c105
commit
6b2e837bc2
|
@ -1,4 +1,4 @@
|
||||||
// Thomas Nagy, 2011
|
// Thomas Nagy, 2011-2016
|
||||||
|
|
||||||
#include "foo.h"
|
#include "foo.h"
|
||||||
|
|
||||||
|
@ -17,7 +17,4 @@ class Bar_private : public QWidget {
|
||||||
Bar_private::Bar_private() : QWidget(NULL) {
|
Bar_private::Bar_private() : QWidget(NULL) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WAF
|
|
||||||
#include "foo.moc"
|
#include "foo.moc"
|
||||||
#include "foo.cpp.moc"
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// Thomas Nagy, 2011
|
// Thomas Nagy, 2011-2016
|
||||||
|
|
||||||
#ifndef _FOO
|
#ifndef _FOO
|
||||||
#define _FOO
|
#define _FOO
|
||||||
|
|
|
@ -543,7 +543,7 @@ def find_qt5_binaries(self):
|
||||||
else:
|
else:
|
||||||
self.fatal('Could not find qmake for qt5')
|
self.fatal('Could not find qmake for qt5')
|
||||||
|
|
||||||
self.env.QT_INSTALL_BINS = qtbin = self.cmd_and_log(self.env.QMAKE + ['-query', 'QT_INSTALL_BINS']).strip() + os.sep
|
self.env.QT_HOST_BINS = qtbin = self.cmd_and_log(self.env.QMAKE + ['-query', 'QT_HOST_BINS']).strip()
|
||||||
paths.insert(0, qtbin)
|
paths.insert(0, qtbin)
|
||||||
|
|
||||||
def find_bin(lst, var):
|
def find_bin(lst, var):
|
||||||
|
|
Loading…
Reference in New Issue