diff options
| author | axis <qt-info@nokia.com> | 2009-05-18 14:25:08 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-18 14:25:08 +0200 |
| commit | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (patch) | |
| tree | aff37bf74549836696d420477e57f51969e97091 /util/install/win/pages/finishpage.ui | |
| parent | 3e5abb158c1924e555dc4142c4be89adc517b8c1 (diff) | |
| parent | 7008bfe80e0466ed2978b39e7e698bbd52fb690f (diff) | |
| download | qt4-tools-6e81bfbaf69864a06240835e0b30cdc47a2668b7.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
Diffstat (limited to 'util/install/win/pages/finishpage.ui')
| -rw-r--r-- | util/install/win/pages/finishpage.ui | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/util/install/win/pages/finishpage.ui b/util/install/win/pages/finishpage.ui deleted file mode 100644 index de6b5f7f89..0000000000 --- a/util/install/win/pages/finishpage.ui +++ /dev/null @@ -1,63 +0,0 @@ -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>FinishPage</class> -<widget class="QWidget"> - <property name="name"> - <cstring>FinishPage</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>444</width> - <height>284</height> - </rect> - </property> - <property name="caption"> - <string>Form12</string> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout1</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QTextView"> - <property name="name"> - <cstring>finishText</cstring> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>showReadmeCheck</cstring> - </property> - <property name="text"> - <string>Show README file</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </vbox> - </widget> - </hbox> -</widget> -<layoutdefaults spacing="6" margin="11"/> -</UI> |