feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
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
This commit is contained in:
con
2010-06-11 16:30:39 +02:00
parent ce80ee4f5e 5e40846c23
commit 30fae3eab1
110 changed files with 1328 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/qmljshoverhandler.h
View File

@@ -34,7 +34,6 @@
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class QHelpEngineCore;
class QPoint;
class QStringList;
QT_END_NAMESPACE
@@ -79,10 +78,8 @@ private:
private:
QmlJS::ModelManagerInterface *m_modelManager;
QHelpEngineCore *m_helpEngine;
QString m_helpId;
QString m_toolTip;
bool m_helpEngineNeedsSetup;
};
} // namespace Internal