diff options
| author | con <qtc-committer@nokia.com> | 2010-07-06 15:34:50 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-06 15:34:50 +0200 |
| commit | 1a2a4f6387e890d6564eac5644bb26bfe6985d2c (patch) | |
| tree | 1bbbc92c4f458ca878489d2e84cbc6fa8839b504 /src/plugins/qmldesigner/qmldesignerplugin.pro | |
| parent | 7feed7318b3ca52d56cb6eb8f11233f32bdcae09 (diff) | |
| parent | 15047f8816716af0794da4164daa3e007175a78a (diff) | |
| download | qt-creator-1a2a4f6387e890d6564eac5644bb26bfe6985d2c.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
share/qtcreator/gdbmacros/dumper.py
src/libs/qmljs/qmljs-lib.pri
src/plugins/fakevim/fakevimhandler.cpp
Diffstat (limited to 'src/plugins/qmldesigner/qmldesignerplugin.pro')
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro index 06be937192..e3d5d487e7 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -23,14 +23,18 @@ HEADERS += qmldesignerconstants.h \ designersettings.h \ settingspage.h \ designmodecontext.h \ - styledoutputpaneplaceholder.h + styledoutputpaneplaceholder.h \ + qmlcontextpane.h + SOURCES += qmldesignerplugin.cpp \ designmodewidget.cpp \ application.cpp \ designersettings.cpp \ settingspage.cpp \ designmodecontext.cpp \ - styledoutputpaneplaceholder.cpp + styledoutputpaneplaceholder.cpp \ + qmlcontextpane.cpp + FORMS += settingspage.ui OTHER_FILES += QmlDesigner.pluginspec |