diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
| commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
| tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/kernel/qfontdatabase_x11.cpp | |
| parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
| download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip | |
Sync with latest script
Diffstat (limited to 'src/kernel/qfontdatabase_x11.cpp')
| -rw-r--r-- | src/kernel/qfontdatabase_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp index 2c6775954..77a7ad17f 100644 --- a/src/kernel/qfontdatabase_x11.cpp +++ b/src/kernel/qfontdatabase_x11.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -634,7 +634,7 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) int r = atoi(tokens[ResolutionY]); fd->pixelSize = atoi(tokens[PixelSize]); - // not "0" or "*", or retquired DPI + // not "0" or "*", or required DPI if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) && r != TQPaintDevice::x11AppDpiY( screen ) ) { // calculate actual pointsize for display DPI |