Commit 4b8df15f authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
parents 3a808b0f 62fd2713
......@@ -1106,6 +1106,12 @@ class Dumper:
if fullUpdateNeeded and not self.tooltipOnly and not self.noLocals:
locals = listOfLocals(varList)
if "autotest" in options:
for item in listOfLocals([]):
self.expandedINames.add(item.iname)
self.expandedINames.discard("")
warn("EXPANDED: %s" % self.expandedINames)
# Take care of the return value of the last function call.
if len(resultVarName) > 0:
try:
......
......@@ -107,10 +107,10 @@ QDeclarativeViewInspector::QDeclarativeViewInspector(QDeclarativeView *view, QOb
SIGNAL(objectCreationRequested(QString,QObject*,QStringList,QString,int)),
data.data(), SLOT(_q_createQmlObject(QString,QObject*,QStringList,QString,int)));
connect(data->debugService,
SIGNAL(objectDeletionRequested(QObject *)), data.data(), SLOT(_q_deleteQmlObject(QObject *)));
SIGNAL(objectDeletionRequested(QObject*)), data.data(), SLOT(_q_deleteQmlObject(QObject*)));
connect(data->debugService,
SIGNAL(objectReparentRequested(QObject *, QObject *)),
data.data(), SLOT(_q_reparentQmlObject(QObject *, QObject *)));
SIGNAL(objectReparentRequested(QObject*,QObject*)),
data.data(), SLOT(_q_reparentQmlObject(QObject*,QObject*)));
connect(data->debugService, SIGNAL(clearComponentCacheRequested()),
data.data(), SLOT(_q_clearComponentCache()));
connect(data->view, SIGNAL(statusChanged(QDeclarativeView::Status)),
......
......@@ -934,7 +934,7 @@ void QDeclarativeViewer::showProxySettings()
{
ProxySettings settingsDlg (this);
connect (&settingsDlg, SIGNAL (accepted()), this, SLOT (proxySettingsChanged ()));
connect(&settingsDlg, SIGNAL(accepted()), this, SLOT(proxySettingsChanged()));
settingsDlg.exec();
}
......
......@@ -145,7 +145,7 @@ WebTouchNavigation::WebTouchNavigation(QObject *parent, QWebPage *webPage)
m_physics->setParent(this);
m_scroller = new WebTouchScroller(this);
connect(m_physics, SIGNAL(positionChanged(QPointF, QPoint)), m_scroller, SLOT(scroll(QPointF, QPoint)));
connect(m_physics, SIGNAL(positionChanged(QPointF,QPoint)), m_scroller, SLOT(scroll(QPointF,QPoint)));
connect(m_scroller, SIGNAL(rangeChanged(QRectF)), m_physics, SLOT(setRange(QRectF)));
}
......
......@@ -39,12 +39,12 @@ leave room for the Qt 4 target page.
-->
<wizard version="1" kind="project"
class="qt4project" firstpage="10"
id="R.Plain C" category="H.QtProjects"
id="R.Plain C" category="I.Projects"
featuresRequired="QtSupport.Wizards.FeatureQt">
<icon>console.png</icon>
<description>Creates a plain C project using qmake, not using the Qt library.</description>
<displayname>Plain C Project</displayname>;
<displaycategory>Other Projects</displaycategory>
<displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.c" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
......
......@@ -39,12 +39,12 @@ leave room for the Qt 4 target page.
-->
<wizard version="1" kind="project"
class="qt4project" firstpage="10"
id="R.Plain C++" category="H.QtProjects"
id="R.Plain C++" category="I.Projects"
featuresRequired="QtSupport.Wizards.FeatureQt">
<icon>console.png</icon>
<description>Creates a plain C++ project using qmake, not using the Qt library.</description>
<displayname>Plain C++ Project</displayname>;
<displaycategory>Other Projects</displaycategory>
<displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.cpp" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
......
......@@ -70,6 +70,8 @@ GridView {
verticalMaximumValue: vscrollbar.maximumValue
onVerticalValueChanged: gridView.contentY = verticalValue
verticalValue: gridView.contentY
}
ScrollBar {
......@@ -86,5 +88,6 @@ GridView {
onValueChanged: gridView.contentY = value
anchors.rightMargin: styleitem.frameoffset
anchors.bottomMargin: hscrollbar.visible ? hscrollbar.height : styleitem.frameoffset
value: gridView.contentY
}
}
......@@ -53,6 +53,8 @@ Text {
mouseArea.state = ""
}
property bool enlargeMouseArea: true
CustomFonts {
id: fonts
}
......@@ -87,7 +89,7 @@ Text {
MouseArea {
id: mouseArea
anchors.fill: parent
anchors.margins: -8
anchors.margins: enlargeMouseArea ? -8 : 0
hoverEnabled: true
QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent }
......
......@@ -68,6 +68,8 @@ Item {
width: delegate.ListView.view.width - 80
elide: Text.ElideRight
enlargeMouseArea: false
Rectangle {
z: -4
color: "#f9f9f9"
......@@ -126,11 +128,30 @@ Item {
font: fonts.boldDescription
}
Text {
text: modelData
x: 4
function multiLinePath(path) {
if (path.length < 42)
return path;
var index = 0;
var oldIndex = 0;
while (index != -1 && index < 40) {
oldIndex = index;
index = path.indexOf("/", index + 1);
if (index == -1)
index = path.indexOf("\\", index + 1);
}
var newPath = path.substr(0, oldIndex + 1) + "\n"
+ path.substr(oldIndex + 1, path.length - oldIndex - 1);
return newPath;
}
text: multiLinePath(modelData)
font: fonts.smallPath
elide: Text.ElideMiddle
wrapMode: Text.WrapAnywhere
maximumLineCount: 2
elide: Text.ElideRight
height: font.pixelSize * 2 + 4
color: "#6b6b6b"
width: delegate.ListView.view.width - 40
width: delegate.ListView.view.width - 48
MouseArea {
anchors.fill: parent
hoverEnabled: true
......
......@@ -76,7 +76,7 @@ Item {
function hide() {
toolTip.opacity = 0;
oldClip = originalParent.clip
var oldClip = originalParent.clip
originalParent.clip = false
toolTip.parent = originalParent
originalParent.clip = true
......
......@@ -136,7 +136,7 @@ PluginSpec *PluginView::currentPlugin() const
void PluginView::updateList()
{
connect(m_ui->categoryWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this, SLOT(updatePluginSettings(QTreeWidgetItem*, int)));
this, SLOT(updatePluginSettings(QTreeWidgetItem*,int)));
PluginCollection *defaultCollection = 0;
foreach(PluginCollection *collection, p->manager->pluginCollections()) {
......
......@@ -445,7 +445,7 @@ QWidget* ContextPaneWidget::createFontWidget()
m_textWidget = new ContextPaneTextWidget(this);
connect(m_textWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant)));
connect(m_textWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString)));
connect(m_textWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)));
connect(m_textWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)));
return m_textWidget;
}
......@@ -456,7 +456,7 @@ QWidget* ContextPaneWidget::createEasingWidget()
connect(m_easingWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant)));
connect(m_easingWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString)));
connect(m_easingWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)));
connect(m_easingWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)));
return m_easingWidget;
}
......@@ -466,7 +466,7 @@ QWidget *ContextPaneWidget::createImageWidget()
m_imageWidget = new ContextPaneWidgetImage(this);
connect(m_imageWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant)));
connect(m_imageWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString)));
connect(m_imageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)));
connect(m_imageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)));
return m_imageWidget;
}
......@@ -476,7 +476,7 @@ QWidget *ContextPaneWidget::createBorderImageWidget()
m_borderImageWidget = new ContextPaneWidgetImage(this, true);
connect(m_borderImageWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant)));
connect(m_borderImageWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString)));
connect(m_borderImageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)));
connect(m_borderImageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)));
return m_borderImageWidget;
......@@ -487,7 +487,7 @@ QWidget *ContextPaneWidget::createRectangleWidget()
m_rectangleWidget = new ContextPaneWidgetRectangle(this);
connect(m_rectangleWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant)));
connect(m_rectangleWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString)));
connect(m_rectangleWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)));
connect(m_rectangleWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)));
return m_rectangleWidget;
}
......
......@@ -62,7 +62,7 @@ FileWidget::FileWidget(QWidget *parent) : QWidget(parent), m_filter("(*.*)"), m_
m_pushButton->setText("...");
connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(lineEditChanged()));
connect(m_pushButton, SIGNAL(released()), this, SLOT(onButtonReleased()));
connect(m_comboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(comboBoxChanged()));
connect(m_comboBox, SIGNAL(editTextChanged(QString)), this, SLOT(comboBoxChanged()));
}
FileWidget::~FileWidget()
......
......@@ -1124,27 +1124,10 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
}
break;
case function_start: {
// in these states, align to the 'function' keyword
const int parentType = parentState.type;
if (parentType == objectdefinition_open
|| parentType == paren_open
|| parentType == bracket_open) {
*indentDepth = tokenPosition;
*savedIndentDepth = *indentDepth;
break;
}
// otherwise find the enclosing expression end state and align to that
for (int i = 1; state(i).type != topmost_intro; ++i) {
const int type = state(i).type;
if (isExpressionEndState(type)) {
*indentDepth = state(i - 1).savedIndentDepth;
break;
}
}
case function_start:
// align to the beginning of the line
*savedIndentDepth = *indentDepth = column(tokenAt(0).begin());
break;
}
case do_statement_while_paren_open:
case statement_with_condition_paren_open:
......
......@@ -154,12 +154,12 @@ QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
d = new QDeclarativeFolderListModelPrivate;
d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
, this, SLOT(inserted(const QModelIndex&,int,int)));
connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int))
, this, SLOT(removed(const QModelIndex&,int,int)));
connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&))
, this, SLOT(handleDataChanged(const QModelIndex&,const QModelIndex&)));
connect(&d->model, SIGNAL(rowsInserted(QModelIndex,int,int))
, this, SLOT(inserted(QModelIndex,int,int)));
connect(&d->model, SIGNAL(rowsRemoved(QModelIndex,int,int))
, this, SLOT(removed(QModelIndex,int,int)));
connect(&d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex))
, this, SLOT(handleDataChanged(QModelIndex,QModelIndex)));
connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh()));
connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
}
......
......@@ -62,7 +62,7 @@ ConsoleProcess::ConsoleProcess(QObject *parent) :
connect(&d->m_stubServer, SIGNAL(newConnection()), SLOT(stubConnectionAvailable()));
d->m_process.setProcessChannelMode(QProcess::ForwardedChannels);
connect(&d->m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
connect(&d->m_process, SIGNAL(finished(int,QProcess::ExitStatus)),
SLOT(stubExited()));
}
......
......@@ -129,12 +129,12 @@ int HistoryListModel::rowCount(const QModelIndex &parent) const
if (qobject_cast<QLineEdit *>(lastSeenWidget))
// this will result in spamming the history with garbage in some corner cases.
// not my idea.
disconnect(lastSeenWidget, SIGNAL(editingFinished ()), completer, SLOT(saveHistory()));
disconnect(lastSeenWidget, SIGNAL(editingFinished()), completer, SLOT(saveHistory()));
HistoryListModel *that = const_cast<HistoryListModel *>(this);
that->lastSeenWidget = completer->widget();
that->fetchHistory();
if (qobject_cast<QLineEdit *>(lastSeenWidget))
connect(lastSeenWidget, SIGNAL(editingFinished ()), completer, SLOT(saveHistory()));
connect(lastSeenWidget, SIGNAL(editingFinished()), completer, SLOT(saveHistory()));
}
if (parent.isValid())
return 0;
......
......@@ -93,10 +93,10 @@ SftpChannel::SftpChannel(quint32 channelId,
Qt::QueuedConnection);
connect(d, SIGNAL(initializationFailed(QString)), this,
SIGNAL(initializationFailed(QString)), Qt::QueuedConnection);
connect(d, SIGNAL(dataAvailable(Utils::SftpJobId, QString)), this,
SIGNAL(dataAvailable(Utils::SftpJobId, QString)), Qt::QueuedConnection);
connect(d, SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)), this,
SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)),
connect(d, SIGNAL(dataAvailable(Utils::SftpJobId,QString)), this,
SIGNAL(dataAvailable(Utils::SftpJobId,QString)), Qt::QueuedConnection);
connect(d, SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)), this,
SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)),
Qt::QueuedConnection);
connect(d, SIGNAL(finished(Utils::SftpJobId,QString)), this,
SIGNAL(finished(Utils::SftpJobId,QString)), Qt::QueuedConnection);
......
......@@ -288,10 +288,10 @@ void SftpFileSystemModel::handleSshConnectionFailure()
void SftpFileSystemModel::handleSftpChannelInitialized()
{
connect(d->sftpChannel.data(),
SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)),
SLOT(handleFileInfo(Utils::SftpJobId, QList<Utils::SftpFileInfo>)));
connect(d->sftpChannel.data(), SIGNAL(finished(Utils::SftpJobId, QString)),
SLOT(handleSftpJobFinished(Utils::SftpJobId, QString)));
SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)),
SLOT(handleFileInfo(Utils::SftpJobId,QList<Utils::SftpFileInfo>)));
connect(d->sftpChannel.data(), SIGNAL(finished(Utils::SftpJobId,QString)),
SLOT(handleSftpJobFinished(Utils::SftpJobId,QString)));
statRootDirectory();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment