summaryrefslogtreecommitdiff
path: root/tools/designer/src/components/formeditor/qtbrushmanager.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-08 17:09:44 +0100
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-08 17:09:44 +0100
commit148401f3a1b8f9203c3f45465f0ec29fefcd61d3 (patch)
tree4d55e962be202b9757eb1088eaaf39f17f38bbf8 /tools/designer/src/components/formeditor/qtbrushmanager.cpp
parent4596db451cd2c53768e42b00a4234e7de2149f39 (diff)
parentf0d2a0d7a9ed0500a1423bbf1362b234525f8be7 (diff)
downloadqt4-tools-148401f3a1b8f9203c3f45465f0ec29fefcd61d3.tar.gz
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
Diffstat (limited to 'tools/designer/src/components/formeditor/qtbrushmanager.cpp')
-rw-r--r--tools/designer/src/components/formeditor/qtbrushmanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.cpp b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
index 46fd9e5ecd..2c428cab0c 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.cpp
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**