2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-26 11:51:20 +01:00
Commit Graph

32 Commits

Author SHA1 Message Date
Thomas Nagy
e297881d30
Missing method in qt5.py 2014-10-25 13:50:23 +02:00
Thomas Nagy
d24092184a
Issue 1502 - too much caching in qt logic 2014-10-25 13:39:22 +02:00
Thomas Nagy
11180ae9f6 rcc detection for rcc-qt4 2014-03-11 01:24:49 +01:00
Jérôme Carretero
33a60e79e7 treecleaner: 'in [...]' replaced by 'in (...)' where appropriate 2014-01-05 16:27:06 -05:00
Thomas Nagy
5664664a1a regression in qt4.py when adding qt5.py 2013-11-24 17:58:50 +01:00
Thomas Nagy
cf75dc3308 qt5 tool 2013-11-24 14:19:28 +01:00
Thomas Nagy
bccf38b50a Issue 1381 - moc file caching 2013-11-23 12:50:39 +01:00
Jérôme Carretero
14ee893d20 Tools: qt4: command paths are lists already 2013-09-04 23:35:58 -04:00
Thomas Nagy
a1b8eb3831 Issue 1352, changed the default name for qt resources 2013-09-01 21:29:34 +02:00
Thomas Nagy
30c10e85d5 Issue 1343, regression in qt4 support after some refactoring 2013-08-12 07:55:01 +02:00
Thomas Nagy
144f4a4d25 Issue 1321, more accurate task count for qt4 and build groups 2013-05-29 22:36:07 +02:00
Thomas Nagy
5b3dc2c5ab apidoc fixes 2013-05-25 22:49:22 +02:00
Thomas Nagy
6d570f08bd use os.remove instead of os.unlink for consistency 2013-05-18 19:51:45 +02:00
Thomas Nagy
426637d10a Prevent unnecessary rebuilds in the qt processing
A list was changed during iteration, causing an unnecessary dependency to be
kept, and triggering subsequent rebuilds. This only occured with multiple .moc included.
2013-05-18 19:31:56 +02:00
Thomas Nagy
8267e7ae97 Issue 1318 reuse moc tasks 2013-05-18 14:08:41 +02:00
Thomas Nagy
29f80f4aeb Issue 1317 append to moc flags 2013-05-18 09:48:27 +02:00
Thomas Nagy
621ffa83ed Issue 1315 QtDesigner library detection in qt4.py 2013-05-16 08:22:16 +02:00
Thomas Nagy
57f0df2c8a Remove the requirement for opt.load('qt4') 2013-05-08 16:51:14 +02:00
Thomas Nagy
d151c86ad1 Issue 1262 2013-05-04 09:24:38 +02:00
Thomas Nagy
43caa85c5a Issue 1272 2013-05-01 10:55:26 +02:00
Jerome Carretero
2072e65e6f qt4: use os.environ, not conf.environ 2012-08-04 16:33:47 -04:00
Johan Boule
6c74f1051b It was meant to be a try-finally block, to ensure file is closed. 2012-07-09 03:39:59 +02:00
Thomas Nagy
5915ae6d59 cosmetic changes 2012-06-02 09:29:30 +02:00
Thomas Nagy
10d3ecdc34 add the missing finally block to open() 2012-05-19 10:27:47 +02:00
Jerome Carretero
91802ba41f Allow cross-compiling of qt4 applications (plz2review)
I'm cross-compiling the qt4 demo with::

   export QT4_ROOT=/path/to/win32/qt4
   QT4_INCLUDES=$QT4_ROOT/include QT4_XCOMPILE=1 QT4_BIN="$PWD" QT4_LIBDIR=$QT4_ROOT/lib \
    CXX=i686-pc-mingw32-g++ CC=i686-pc-mingw32-gcc CFLAGS=-g CXXFLAGS=-g waf configure

I made a simple wrapper for the qt tools::

   lrwxrwxrwx 1 cJ cJ     7 May 12 14:08 moc -> wrapper*
   lrwxrwxrwx 1 cJ cJ     7 May 12 14:02 qmake -> wrapper*
   lrwxrwxrwx 1 cJ cJ     7 May 12 14:09 rcc -> wrapper*
   lrwxrwxrwx 1 cJ cJ     7 May 12 14:04 uic -> wrapper*
   -rwxrwxr-x 1 cJ cJ   318 May 12 14:04 wrapper*

Wrapper contents::

   #!/usr/bin/env python
   # Calls win32 Qt tools via wine (too lazy to install the same version)

   import sys, os, subprocess

   QT4_ROOT = os.environ["QT4_ROOT"]
   tool = os.path.basename(sys.argv[0])
   args = sys.argv[1:]
   cmd = [
    "wine",
    "%s/bin/%s" % (QT4_ROOT, tool),
   ] + args

   sys.exit(subprocess.call(cmd))

Note: disabled localization in qt4 demo wscript as I don't need it.
2012-05-12 14:56:09 -04:00
Thomas Nagy
5aee9e74a8 Issue 1123 2012-03-09 20:16:56 +01:00
Thomas Nagy
cdb339213b Issue 1098 2012-01-05 21:01:11 +01:00
Thomas Nagy
dd4984aab0 #1095 2011-12-31 14:32:38 +01:00
Thomas Nagy
4bc064a119 enable the qt4 tool to run even if xml support is missing 2011-12-17 15:45:42 +01:00
Thomas Nagy
68a5675914 more powerpc fixes 2011-11-19 13:35:21 +01:00
Thomas Nagy
e6f8d1e9ee evil osx stuff 2011-11-19 13:21:02 +01:00
Thomas Nagy
44a967e326 Initial commit 2011-09-10 11:13:51 +02:00