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/tools | |
| 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/tools')
| -rw-r--r-- | examples/tools/settingseditor/locationdialog.cpp | 2 |
1 files changed, 1 insertions, 1 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; |