diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2015-09-23 18:02:27 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2015-09-23 20:07:15 (GMT) |
| commit | d38cb7ee2ed72429498f33d2bd7925a92885b282 (patch) | |
| tree | 4be2e3eb52a93668df6cfb5b926158ea9c0478af /src/qtbase.mk | |
| parent | b52642a62d7ab75751b9e22e13043b0f61bae50a (diff) | |
| download | mxe-d38cb7ee2ed72429498f33d2bd7925a92885b282.zip mxe-d38cb7ee2ed72429498f33d2bd7925a92885b282.tar.gz mxe-d38cb7ee2ed72429498f33d2bd7925a92885b282.tar.bz2 | |
qt and qtbase: fix the test built the manual way
Add MOC and RCC commands and files produced to the test.
close #883
Diffstat (limited to 'src/qtbase.mk')
| -rw-r--r-- | src/qtbase.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/qtbase.mk b/src/qtbase.mk index 6cfe342..676de59 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -72,9 +72,17 @@ define $(PKG)_BUILD # build test the manual way mkdir '$(1)/test-$(PKG)-pkgconfig' '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui' + '$(PREFIX)/$(TARGET)/qt5/bin/moc' \ + -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + '$(TOP_DIR)/src/qt-test.hpp' + '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc' '$(TARGET)-g++' \ -W -Wall -Werror -std=c++0x -pedantic \ - '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ + '$(TOP_DIR)/src/qt-test.cpp' \ + '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \ + '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \ + -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ -I'$(1)/test-$(PKG)-pkgconfig' \ `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs` |