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/libs/qmljs/qmljs-lib.pri | |
| 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/libs/qmljs/qmljs-lib.pri')
| -rw-r--r-- | src/libs/qmljs/qmljs-lib.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri index f04185efe4..411e108bd3 100644 --- a/src/libs/qmljs/qmljs-lib.pri +++ b/src/libs/qmljs/qmljs-lib.pri @@ -24,6 +24,7 @@ HEADERS += \ $$PWD/qmljscompletioncontextfinder.h \ $$PWD/qmljscomponentversion.h \ $$PWD/qmljsmodelmanagerinterface.h \ + $$PWD/qmljsicontextpane.h \ $$PWD/qmljspropertyreader.h \ $$PWD/qmljsrewriter.h |