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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
This commit is contained in:
Eike Ziller
2012-03-21 09:57:56 +01:00
parent acd49da492 0e9bd4677c
commit 7931159c09
42 changed files with 406 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -130,7 +130,7 @@ void QmlProject::parseProject(RefreshOptions options)
messageManager->printToOutputPane(
tr("Warning while loading project file %1.").arg(m_fileName));
messageManager->printToOutputPane(
tr("File '%' does not exist or is not readable.").arg(mainFilePath), true);
tr("File '%1' does not exist or is not readable.").arg(mainFilePath), true);
}
}
}

12
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -101,18 +101,18 @@ void QmlProjectPlugin::extensionsInitialized()
void QmlProjectPlugin::showQmlObserverToolWarning()
{
QMessageBox dialog(QApplication::activeWindow());
QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
QPushButton *qtPref = dialog.addButton(tr("Open Qt Versions"),
QMessageBox::ActionRole);
dialog.addButton(QMessageBox::Cancel);
dialog.setDefaultButton(qtPref);
dialog.setWindowTitle(tr("QML Observer Missing"));
dialog.setText(tr("QML Observer could not be found."));
dialog.setText(tr("QML Observer could not be found for this Qt version."));
dialog.setInformativeText(tr(
"QML Observer is used to offer debugging features for "
"QML applications, such as interactive debugging and inspection tools. "
"It must be compiled for each used Qt version separately. "
"On the Qt4 options page, select the current Qt installation "
"and click Rebuild."));
"Qt Quick UI projects in the Qt 4.7 series.\n\n"
"To compile QML Observer, go to the Qt Versions page, "
"select the current Qt version, "
"and click Build in the Helpers section."));
dialog.exec();
if (dialog.clickedButton() == qtPref) {
Core::ICore::showOptionsDialog(