Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/qtconfig/mainwindow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    6969#ifndef QT_NO_GSTREAMER
    7070#include <gst/gst.h>
     71
     72
    7173#include <phonon/phononnamespace.h>
    7274#endif
     
    8082// extern bool Q_CORE_EXPORT qt_resolve_symlinks;
    8183
    82 static const char *appearance_text =
     84static const char *appearance_text =
    8385"<p><b><font size+=2>Appearance</font></b></p>"
    8486"<hr>"
     
    9496"the advanced palette editor."
    9597"<p>The Preview Window shows what the selected Style and colors look "
    96 "like.";
    97 
    98 static const char *font_text =
     98"like.";
     99
     100static const char *font_text =
    99101"<p><b><font size+=2>Fonts</font></b></p>"
    100102"<hr>"
     
    113115"from the Mincho font.  Because the font substitutions are "
    114116"lists, you can also select multiple families, such as Song Ti (for "
    115 "use with Chinese text).";
    116 
    117 static const char *interface_text =
     117"use with Chinese text).";
     118
     119static const char *interface_text =
    118120"<p><b><font size+=2>Interface</font></b></p>"
    119121"<hr>"
     
    130132"<p>XIM (Extended Input Methods) are used for entering characters in "
    131133"languages that have large character sets, for example, Chinese and "
    132 "Japanese.";
     134"Japanese.";
    133135// ### What does the 'Enhanced support for languages written R2L do?
    134136
    135 static const char *printer_text =
     137static const char *printer_text =
    136138"<p><b><font size+=2>Printer</font></b></p>"
    137139"<hr>"
     
    144146"<p>When using font embedding you can select additional directories where "
    145147"Qt should search for embeddable font files.  By default, the X "
    146 "server font path is used.";
    147 
    148 static const char *phonon_text =
     148"server font path is used.";
     149
     150static const char *phonon_text =
    149151"<p><b><font size+=2>Phonon</font></b></p>"
    150152"<hr>"
    151153"<p>Use this tab to configure the Phonon GStreamer multimedia backend. "
    152154"<p>It is reccommended to leave all settings on \"Auto\" to let "
    153 "Phonon determine your settings automatically.";
     155"Phonon determine your settings automatically.";
    154156
    155157static QColorGroup::ColorRole centralFromItem( int item )
     
    388390    audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
    389391                                tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
     392
     393
     394
    390395#ifndef QT_NO_GSTREAMER
    391     phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
    392396    if (gst_init_check(0, 0, 0)) {
    393397        gchar *versionString = gst_version_string();
     
    429433#ifndef QT_NO_OPENGL
    430434    videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
    431     videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
     435    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
    432436#endif
    433437    videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
     
    10001004    box.setText(tr("<h3>%1</h3>"
    10011005                   "<br/>Version %2"
    1002                    "<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).")
     1006                   "<br/><br/>Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).")
    10031007                   .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR)));
    10041008    box.setWindowTitle(tr("Qt Configuration"));
Note: See TracChangeset for help on using the changeset viewer.