# HG changeset patch # User Volker Grabsch # Date 1264201730 -3600 # Node ID 0238a7b6bca239893c51f14b9b991f0e4c95e3c8 # Parent 8bb726b9c531ffdacdafe8da2b013d368d2ff308# Parent f77810598227e3fc84811847052b46f2e680045f merge diff -r 8bb726b9c531 -r 0238a7b6bca2 src/qt-test.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-test.cpp Sat Jan 23 00:08:50 2010 +0100 @@ -0,0 +1,15 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html or doc/README for further information. */ + +#include +#include "ui_qt-test.h" + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + QMainWindow w; + Ui::MainWindow u; + u.setupUi(&w); + w.show(); + return a.exec(); +} diff -r 8bb726b9c531 -r 0238a7b6bca2 src/qt-test.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-test.pro Sat Jan 23 00:08:50 2010 +0100 @@ -0,0 +1,6 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +TARGET = test-qt +SOURCES += qt-test.cpp +FORMS += qt-test.ui diff -r 8bb726b9c531 -r 0238a7b6bca2 src/qt-test.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-test.ui Sat Jan 23 00:08:50 2010 +0100 @@ -0,0 +1,107 @@ + + + + + + + MainWindow + + + + 0 + 0 + 400 + 300 + + + + test-qt + + + + + + + + + + + + test-qt + + + +

test-qt

+

test-qt

+
    +
  1. test-qt
    2. +
  2. test-qt
    3. +
  3. test-qt
    4. +
+ + + ]]> + + + + + + + + + + 0 + 0 + 400 + 26 + + + + + &File + + + + + + + + + &Quit + + + Ctrl+Q + + + + + + + actionQuit + triggered() + MainWindow + close() + + + -1 + -1 + + + 399 + 299 + + + + + diff -r 8bb726b9c531 -r 0238a7b6bca2 src/qt.mk --- a/src/qt.mk Fri Jan 22 16:28:40 2010 +0100 +++ b/src/qt.mk Sat Jan 23 00:08:50 2010 +0100 @@ -42,15 +42,15 @@ -nomake docs \ -nomake translations - $(MAKE) -C '$(1)'.native -j $(JOBS) sub-tools-bootstrap - $(MAKE) -C '$(1)'.native -j $(JOBS) sub-moc - $(MAKE) -C '$(1)'.native -j $(JOBS) sub-rcc - $(MAKE) -C '$(1)'.native -j $(JOBS) sub-uic + $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-tools-bootstrap + $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-moc + $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-rcc + $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic # rebuild qmake to use "-unix" as default and to use the correct "ar" command $(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp $(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp - $(MAKE) -C '$(1)'.native/qmake -j $(JOBS) + $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)' # install the native tools manually $(INSTALL) -m755 '$(1)'.native/bin/moc '$(PREFIX)/bin/$(TARGET)-moc' @@ -132,7 +132,13 @@ -v $(MAKE) -C '$(1)' -j '$(JOBS)' - $(TARGET)-ranlib '$(1)'/lib/*.a + '$(TARGET)-ranlib' '$(1)'/lib/*.a rm -rf '$(PREFIX)/$(TARGET)/mkspecs' - $(MAKE) -C '$(1)' install + $(MAKE) -C '$(1)' -j 1 install + + mkdir '$(1)/test-qt' + cp '$(2)'* '$(1)/test-qt/' + cd '$(1)/test-qt' && '$(TARGET)-qmake' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(PREFIX)/$(TARGET)/bin/' endef