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:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
This commit is contained in:
hjk
2010-08-18 10:05:53 +02:00
parent 088e5fd5dc ffdd4110ae
commit b59fa0cd8b
24 changed files with 3852 additions and 7400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -143,13 +143,15 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
Core::ActionContainer *menuQtQuick = am->createMenu(Constants::M_QTQUICK);
menuQtQuick->menu()->setTitle(tr("Qt Quick"));
mtools->addMenu(menuQtQuick);
m_actionPreview = new QAction("&Preview", this);
m_actionPreview = new QAction(tr("&Preview"), this);
Core::Context toolsMenuContext(QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU);
Core::Command *cmd = addToolAction(m_actionPreview, am, toolsMenuContext,
QLatin1String("QtQuick.Preview"), menuQtQuick, tr("Ctrl+Alt+R"));
connect(cmd->action(), SIGNAL(triggered()), SLOT(openPreview()));
m_previewRunner = new QmlJSPreviewRunner(this);
m_actionPreview->setEnabled(m_previewRunner->isReady());
QAction *followSymbolUnderCursorAction = new QAction(tr("Follow Symbol Under Cursor"), this);
cmd = am->registerAction(followSymbolUnderCursorAction, Constants::FOLLOW_SYMBOL_UNDER_CURSOR, context);

6
src/plugins/qmljseditor/qmljspreviewrunner.cpp
View File

@@ -18,12 +18,16 @@ QmlJSPreviewRunner::QmlJSPreviewRunner(QObject *parent) :
const QString searchPath = QCoreApplication::applicationDirPath()
+ Utils::SynchronousProcess::pathSeparator()
+ QString(qgetenv("PATH"));
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qml"));
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer"));
ProjectExplorer::Environment environment = ProjectExplorer::Environment::systemEnvironment();
m_applicationLauncher.setEnvironment(environment.toStringList());
}
bool QmlJSPreviewRunner::isReady() const
{
return !m_qmlViewerDefaultPath.isEmpty();
}
void QmlJSPreviewRunner::run(const QString &filename)
{

2
src/plugins/qmljseditor/qmljspreviewrunner.h
View File

@@ -13,6 +13,8 @@ class QmlJSPreviewRunner : public QObject
Q_OBJECT
public:
explicit QmlJSPreviewRunner(QObject *parent = 0);
bool isReady() const;
void run(const QString &filename);
signals: