diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
| commit | e15ab744f15127422ef62a0b70e6cf129f52f48f (patch) | |
| tree | 72352e1e297f0322610234c2eeb994820407616e /tests/auto/uic/baseline/preferencesdialog.ui.h | |
| parent | 04802c1fe74439111c7bbe92fcb777dcbd618500 (diff) | |
| parent | b3b9813f1083fc556aea1f952329551da97aee90 (diff) | |
| download | Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/uic/baseline/preferencesdialog.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/preferencesdialog.ui.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/uic/baseline/preferencesdialog.ui.h index 56c5926..33b7e68 100644 --- a/tests/auto/uic/baseline/preferencesdialog.ui.h +++ b/tests/auto/uic/baseline/preferencesdialog.ui.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'preferencesdialog.ui' ** -** Created: Tue Aug 18 19:03:32 2009 +** Created: Fri Sep 4 10:17:14 2009 ** by: Qt User Interface Compiler version 4.6.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -159,7 +159,6 @@ public: m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", 0, QApplication::UnicodeUTF8)); m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8)); m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(PreferencesDialog); } // retranslateUi }; |