FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 1726

This commit is contained in:
Thomas Nagy 2016-05-01 13:21:06 +02:00
parent 5a35d6c105
commit 6b2e837bc2
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demos/qt5/foo.cpp
View File

@ -1,4 +1,4 @@
// Thomas Nagy, 2011
// Thomas Nagy, 2011-2016
#include "foo.h"
@ -17,7 +17,4 @@ class Bar_private : public QWidget {
Bar_private::Bar_private() : QWidget(NULL) {
}
#if WAF
#include "foo.moc"
#include "foo.cpp.moc"
#endif

2
demos/qt5/foo.h
View File

@ -1,4 +1,4 @@
// Thomas Nagy, 2011
// Thomas Nagy, 2011-2016
#ifndef _FOO
#define _FOO

2
waflib/Tools/qt5.py
View File

@ -543,7 +543,7 @@ def find_qt5_binaries(self):
else:
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)
def find_bin(lst, var):