diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-31 13:28:40 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-31 13:28:40 (GMT) |
| commit | 1552a6930d02bd574f5bb7c17fa5994dcb8a9e43 (patch) | |
| tree | d06b8fc8deb0a0739b3e4565a5a4993de897e9b4 /tools | |
| parent | 85313fec454f77322deb7041726573e14f6a262a (diff) | |
| parent | 93135ba7f52e0ccbbcd8bda390a69d089da62b83 (diff) | |
| download | Qt-1552a6930d02bd574f5bb7c17fa5994dcb8a9e43.zip Qt-1552a6930d02bd574f5bb7c17fa5994dcb8a9e43.tar.gz Qt-1552a6930d02bd574f5bb7c17fa5994dcb8a9e43.tar.bz2 | |
Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7
Conflicts:
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicswidget.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/linguist.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro index e1c8a63..85ecd5a 100644 --- a/tools/linguist/linguist.pro +++ b/tools/linguist/linguist.pro @@ -4,5 +4,3 @@ SUBDIRS = \ lrelease \ lupdate \ lconvert -CONFIG += ordered - |