diff options
| author | con <qtc-committer@nokia.com> | 2010-06-11 16:30:39 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-11 16:30:39 +0200 |
| commit | 30fae3eab1f7dcab5cb9fab96956b74a1c7a4ab8 (patch) | |
| tree | b87c2378b4578564728f85359eb8a96a5b7574ff /src/plugins/qmljseditor/qmljseditor.pro | |
| parent | ce80ee4f5e14eae425fd99c570885ac3e39814c6 (diff) | |
| parent | 5e40846c2360877ddfbd54760e85b45929561373 (diff) | |
| download | qt-creator-30fae3eab1f7dcab5cb9fab96956b74a1c7a4ab8.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/projectexplorer/taskwindow.h
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
src/plugins/qmljseditor/qmljshoverhandler.h
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/subversion/subversionplugin.cpp
Diffstat (limited to 'src/plugins/qmljseditor/qmljseditor.pro')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro index acd9da1afa..0058d8b9bb 100644 --- a/src/plugins/qmljseditor/qmljseditor.pro +++ b/src/plugins/qmljseditor/qmljseditor.pro @@ -3,7 +3,6 @@ TARGET = QmlJSEditor include(../../qtcreatorplugin.pri) include(qmljseditor_dependencies.pri) -CONFIG += help DEFINES += \ QMLJSEDITOR_LIBRARY \ QT_CREATOR |