summaryrefslogtreecommitdiffstats
path: root/tools/shared
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-04-04 07:28:35 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-04-04 07:51:22 (GMT)
commite7762b60d519c9ae4b47f6c4ceece584408247ea (patch)
tree4d8577d838aff6fc09576f84ffcc7be2b81c0999 /tools/shared
parent48e91e6beb3cefbc15e583dcdb6005a7d9278104 (diff)
downloadQt-e7762b60d519c9ae4b47f6c4ceece584408247ea.zip
Qt-e7762b60d519c9ae4b47f6c4ceece584408247ea.tar.gz
Qt-e7762b60d519c9ae4b47f6c4ceece584408247ea.tar.bz2
Designer [Qt Creator integration]: Fix integrated property editor.
Within Qt Creator, properties of types int, bool were always disabled in 4.8 after 99160bb9f851bf02fe5345b5f52217b6c77a57c4 (changed implementation of qFindChild). The Property browser solution is included in 2 different designer libraries by pri (shared part and property editor component), that is, some weak symbols of its Q_OBJECTS are duplicated (see gcc-bug 47877). The manifestation is qFindChild<> failing for QInt/BoolPropertyManager in QtVariantEditorFactory::connectPropertyManager(), qvariantproperty.cpp:1998 (Linux/gcc) in the Qt Creator setup. Work around the issue by using a separate profile containing only the key sequence editor required by the shared part of Qt Designer.
Diffstat (limited to 'tools/shared')
-rw-r--r--tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri
new file mode 100644
index 0000000..1755448
--- /dev/null
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri
@@ -0,0 +1,4 @@
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+SOURCES += $$PWD/qtpropertybrowserutils.cpp
+HEADERS += $$PWD/qtpropertybrowserutils_p.h