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

Merge remote-tracking branch 'origin/2.4'

Browse Source
This commit is contained in:
Eike Ziller
2011-10-11 16:14:33 +02:00
parent bc4d15f3c6 e38f2ba675
commit fc6a7f0dd9
50 changed files with 924 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmlprofiler/qmlprofilerattachdialog.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>184</width>
<height>124</height>
<width>185</width>
<height>115</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,21 +19,27 @@
<item row="0" column="0">
<widget class="QLabel" name="addressLabel">
<property name="text">
<string>Address:</string>
<string>&amp;Host:</string>
</property>
<property name="buddy">
<cstring>addressLineEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="addressLineEdit">
<property name="text">
<string>127.0.0.1</string>
<string>localhost</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>Port:</string>
<string>&amp;Port:</string>
</property>
<property name="buddy">
<cstring>portSpinBox</cstring>
</property>
</widget>
</item>
@@ -52,13 +58,6 @@
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">