summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-04 08:07:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-04 08:07:56 (GMT)
commit3840002c93cadb22a67b1f06475d5c1708f507df (patch)
treebc8dc7c0dc479a6cc17c493cb5b5dcf9a7c20a35 /tools
parent618d89d65e367521552e6d6f50b5aa5e04e72025 (diff)
parente7762b60d519c9ae4b47f6c4ceece584408247ea (diff)
downloadQt-3840002c93cadb22a67b1f06475d5c1708f507df.zip
Qt-3840002c93cadb22a67b1f06475d5c1708f507df.tar.gz
Qt-3840002c93cadb22a67b1f06475d5c1708f507df.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer [Qt Creator integration]: Fix integrated property editor.
Diffstat (limited to 'tools')
-rw-r--r--tools/designer/src/lib/shared/shared.pri2
-rw-r--r--tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri4
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/designer/src/lib/shared/shared.pri b/tools/designer/src/lib/shared/shared.pri
index 8286360..9d50911 100644
--- a/tools/designer/src/lib/shared/shared.pri
+++ b/tools/designer/src/lib/shared/shared.pri
@@ -2,7 +2,7 @@
INCLUDEPATH += $$PWD
contains(QT_CONFIG, script): QT += script
-include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
+include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
include(../../../../shared/deviceskin/deviceskin.pri)
include(../../../../../src/tools/rcc/rcc.pri)
include(../../../../shared/findwidget/findwidget.pri)
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