summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-122-2/+7
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use runtime path instead of compile time on Maemo
| * Use runtime path instead of compile time on MaemoJiang Jiang2011-01-122-2/+7
| | | | | | | | | | | | | | Since maemo programs are cross-compiled, we need to use the runtime application path to locate script files here. Reviewed-by: aavit
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-121-1/+5
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Mac: pixmaps dont treat alpha exactly the same as other platforms
| * | Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From fixing qwidget autotest, it seems to be the case that filling a pixmap with a solid color on mac changes the hasAlpha status. This is different from X11 (and raster engine). That is, the following code will produce different result: QPixmap pixmap(100, 100); pixmap.setAlphaChannel(QPixmap(100, 100)); qDebug() << "Has alpha after setting channel?" << pixmap.hasAlpha(); pixmap.fill(Qt::red); qDebug() << "Has alpha after fill?" << pixmap.hasAlpha(); So, this patch remove the possibility of converting an already alpha supporting pixmap to non-alpha upon fill. NB: somewhat related, the following code works the same on both x11, raster and mac (prints 'false'), but still seems wrong: QPixmap pixmap2(pixmap); qDebug() << "pixmap2 has alpha initially?" << pixmap2.hasAlpha(); Rev-By: Fabien Freling
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1215-26/+259
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Only test control character handling in X11 Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| * Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1115-26/+259
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only test control character handling in X11 Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1115-26/+259
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only test control character handling in X11 Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| | * Only test control character handling in X11Jiang Jiang2011-01-111-0/+4
| | | | | | | | | | | | | | | | | | It was a issue in HarfBuzz only. Reviewed-by: Andy Shaw
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1115-26/+255
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1115-26/+255
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1015-26/+255
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
| | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-1091-1415/+4315
| | | | | |\
| | | | | * \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-1015-26/+255
| | | | | |\ \
| | | | | | * | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile fix for devices where qreals are floats. Reviewed-by: Fabien Freling
| | | | | | * | Make application font family names locale sensitive in X11Jiang Jiang2011-01-062-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that they will match the family names returned by QFontDatabase::families. Because the family names returned by FcFreeTypeQueryFace are not sorted with locale as the names returned by FcFontList, we have to find out the family name matching the system language in the former case. Task-number: QTBUG-14269 Reviewed-by: Eskil
| | | | | | * | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeightEskil Abrahamsen Blomfeldt2011-01-044-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make some alterations to merge request 2305: 1. Rename enum for consistency with other APIs in Qt. 2. Correct documentation with actual version number of features. 3. Remove unstandard css syntax in line-height specification. Reviewed-by: Jiang Jiang
| | | | | | * | Add line spacing to QTextBlockFormat, get/set functions, CSS supportJoshua Grauman2011-01-046-6/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds line spacing options to Qt, as in all modern word processors. I primarily checked OpenOffice as a reference for how to position the lines based on the various types of line spacing as well as where to do the page breaks. The following functions were added: void QTextBlockFormat::setLineHeight(qreal height, int heightType) qreal QTextBlockFormat::lineHeight() int QTextBlockFormat::lineHeightType() qreal QTextBlockFormat::lineHeight(qreal scriptLineHeight, qreal scaling) Here are the HeightTypes available: QTextBlockFormat::SingleHeight QTextBlockFormat::ProportionalHeight QTextBlockFormat::FixedHeight QTextBlockFormat::AtLeastHeight QTextBlockFormat::LineDistanceHeight The following CSS syntax was added: line-height:150% line-height:40px line-height:normal line-height:40al line-height:40ld Merge-request: 2305 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| | | | | | * | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-214-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid calling the bounding box function for the same non-printable characters in every call, we cache them as empty in the coords table and bail out before painting them. This patch also fixes some possible reads of uninitialized memory (reference to return value) and reference to a default constructed object consisting of uninitialized pods. Reviewed-by: Samuel
| | | | | | * | Disable certain GPOS features by defaultJiang Jiang2010-12-201-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to OpenType Layout tag registry, these features should be turned off by default. Leaving them on will cause some text layout problems in common UI widgets -- they are usually designed for better positioning in print publishing or full featured text layout programs, not for general usage. There is no way to turn them on in HarfBuzz now, it should be addressed later. Features like 'valt' are intended for vertical writing mode are also turned off, since HarfBuzz doesn't support it properly yet. Task-number: QTBUG-15754 Reviewed-by: Lars Knoll
| | | | | | * | Move advances for control character in Indic syllable shapingJiang Jiang2010-12-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling control characters (ZWJ, ZWNJ) in Indic syllables, we only moved glyphs and attributes of the item, advances should also be moved forward, otherwise we will use the advance of ZWJ/ ZWNJ for the part of syllable, which is normally zero, it results some positioning problems. Task-number: QTBUG-14204 Reviewed-by: Lars Knoll
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-1111-108/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QProcessManager: minor optimization use qBinaryFind instead of bsearch use qBinaryFind instead of bsearch fix two more "comparison between signed and unsigned integer expressions" warnings fix 'QChar::QChar(char)' is deprecated fix another "comparison between signed and unsigned integer expressions" fix warning "comparison between signed and unsigned integer expressions" fix warning "missing braces around initializer for 'in_addr::<anonymous union>'" fix warning "'SeedStorage* randTLS()' defined but not used" remove unused header include make the modifySemaphore() signal-safe on linux fix/stabilizate the year sign change test deal with utcOffset in a correct way
| * | | | | | | QProcessManager: minor optimizationRitt Konstantin2011-01-111-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHash is slightly faster than QMap and should be preferred where the key order has no meaning; take() is faster than value() + remove() Reviewed-by: Olivier Goffart Merge-request: 1017
| * | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 906 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-112-53/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depending on platform, qBinaryFind might be up to 3 times faster than bsearch or a bit bit slower at the worst case; so why don't simply use qBinaryFind instead of bsearch and be an optimist? ;) also we know that all color names are in the lower case already and thus we can avoid lowercasing of them again and again, and again; the name to find needs to be lowercased separately instead. some color-by-name-lookup numbers: before: 0.000737 msecs per iteration (total: 3,684, iterations: 5000000) after: 0.000154 msecs per iteration (total: 771, iterations: 5000000) Merge-request: 906 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix two more "comparison between signed and unsigned integer expressions" ↵Konstantin Ritt2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warnings SQLLEN is unnecessarily an unsigned int Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix 'QChar::QChar(char)' is deprecatedKonstantin Ritt2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix another "comparison between signed and unsigned integer expressions"Konstantin Ritt2011-01-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on win, when used in FD_SET, FD_ISSET, etc., socketDescriptor assumed to be SOCKET which is unsigned int Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix warning "comparison between signed and unsigned integer expressions"Konstantin Ritt2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizeof produces signed int result; QT_SOCKOPTLEN_T is int Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"Konstantin Ritt2011-01-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v.s_addr = 0; does the same Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | fix warning "'SeedStorage* randTLS()' defined but not used"Konstantin Ritt2011-01-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by setting the proper macro-guards; regroup macro-guards for better readability (superfluous change, I know); fix typos in the comments was not splited into two commits to make it more clear why and how that warning is fixed now Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | remove unused header includeRitt Konstantin2011-01-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sysV shm isn't used in QSystemSemaphore Merge-request: 998 Reviewed-by: Olivier Goffart
| * | | | | | | make the modifySemaphore() signal-safe on linuxRitt Konstantin2011-01-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as POSIX man says, if semop() is interrupted by a signal, it shall return -1 and set errno to EINTR. in qcore_unix_p.h, we have EINTR_LOOP helper macro exactly for such cases ;) Task-number: QTBUG-14434 Merge-request: 998 Reviewed-by: Olivier Goffart
| * | | | | | | fix/stabilizate the year sign change testRitt Konstantin2011-01-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this test might fail for the Qt::LocalTime spec in some cases Merge-request: 2536 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | deal with utcOffset in a correct wayRitt Konstantin2011-01-111-2/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like how we do that for ISO format Reviewed-by: ddenis Merge-request: 2536 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-112-8/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: handle O_NONBLOCK'ed pipes specific error on write() move POSIX-specific debug to qprocess_unix.cpp
| * | | | | | handle O_NONBLOCK'ed pipes specific error on write()Ritt Konstantin2011-01-112-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to the write(2) docs: When write requests greater than {PIPE_BUF} bytes to a pipe that has available space at least 1 byte, if O_NONBLOCK is set, write transfers what it can and returns the number of bytes written. When write requests of {PIPE_BUF} or less bytes to a pipe that has no enough space, or write requests for greater than {PIPE_BUF} bytes to a pipe that has no space, if O_NONBLOCK is set, write returns -1 and sets errno to EAGAIN. Merge-request: 997 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | move POSIX-specific debug to qprocess_unix.cppRitt Konstantin2011-01-112-3/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 997 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-01-111-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-01-101-1/+4
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
| * | | | | BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.Sergio Ahumada2011-01-101-1/+4
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Joao
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-1029-204/+227
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: fix wrong case label in toString(subSystemOption) qt project files: create pkg-config files for mingw qmake: write and install pkg-config files for mingw qmake: don't limit pkg-config writing to unix generator qmake: fix double directory separator
| * | | | qmake: fix wrong case label in toString(subSystemOption)Joerg Bornemann2011-01-101-4/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | qt project files: create pkg-config files for mingwMark Brand2011-01-1022-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pkg-config related methods from unix generator to base class so they can be used by other generators too. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | qmake: fix double directory separatorMark Brand2011-01-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-105-5/+12
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix reversed condition introduced in 9a6cfc07e5 Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once
| * | | Fix reversed condition introduced in 9a6cfc07e5João Abecasis2011-01-101-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-085-5/+12
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once
generated by cgit v0.12 at 2025-01-16 01:52:31 (GMT)