summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-31 09:36:32 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-31 09:36:32 (GMT)
commit0c439d67f567ba2e7a1b9ada4e3953e5e598f168 (patch)
tree00801dada770fe63e3027df58d116edccfe07cfd /tools
parentedd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff)
parent622a27c582f859274a5b9e40c625a6fda600b7b1 (diff)
downloadQt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.zip
Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.gz
Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.bz2
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
Diffstat (limited to 'tools')
-rw-r--r--tools/linguist/linguist.pro2
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
-