diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
| commit | 92c998afb66a2ec900d50cab57929c0a97ad46ac (patch) | |
| tree | 1f6219dc64c236c85d7365f8e07ee1df1f27a610 /examples | |
| parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
| parent | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/tools/settingseditor/locationdialog.cpp | 2 | ||||
| -rw-r--r-- | examples/tutorials/addressbook-fr/README | 2 | ||||
| -rw-r--r-- | examples/tutorials/addressbook/README | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/tools/settingseditor/locationdialog.cpp b/examples/tools/settingseditor/locationdialog.cpp index de7e5bcada..dcf190363a 100644 --- a/examples/tools/settingseditor/locationdialog.cpp +++ b/examples/tools/settingseditor/locationdialog.cpp @@ -54,7 +54,7 @@ LocationDialog::LocationDialog(QWidget *parent) scopeComboBox->addItem(tr("System")); organizationComboBox = new QComboBox; - organizationComboBox->addItem(tr("Trolltech")); + organizationComboBox->addItem(tr("Qt")); organizationComboBox->setEditable(true); applicationComboBox = new QComboBox; diff --git a/examples/tutorials/addressbook-fr/README b/examples/tutorials/addressbook-fr/README index 359859390e..5f82d3ce38 100644 --- a/examples/tutorials/addressbook-fr/README +++ b/examples/tutorials/addressbook-fr/README @@ -39,4 +39,4 @@ qmake -spec macx-xcode Then open the generated Xcode project in Xcode and build it. -Feel free to send comments about the tutorial to qt-bugs@trolltech.com. +Feel free to send comments about the tutorial to qt-info@nokia.com. diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README index 20ae7f3ada..5f364d909c 100644 --- a/examples/tutorials/addressbook/README +++ b/examples/tutorials/addressbook/README @@ -39,4 +39,4 @@ qmake -spec macx-xcode Then open the generated Xcode project in Xcode and build it. -Feel free to send comments about the tutorial to qt-bugs@trolltech.com. +Feel free to send comments about the tutorial to qt-info@nokia.com. |