summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added -random option to tests, making the test cases within a test execute ↵Magne Pettersen Zachrisen2010-08-1122-72/+368
| | | | | | | | | | | | | | in arbitrary order. Very useful for avoiding test cases being dependent on the running order. Added -seed option -random to make it possible to reroduce test results. The seed is printed out when -random is specified Added selftests for -random and -seed options Changed int parsing into strtol and QTime->QDateTime as suggested by Mr Macieira, fixed selftests Merge-request: 2362 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1162-118/+145
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix build os QSharedPointer on MSVC Fix for QTBUG-2182: "connection still in use" warnings. Replace gluOrtho2d with glOrtho. Optimize QSharedPointer::operator=(const QSharedPointer &) Make selection work across ligatures Fix compilation on 64-bit Windows. Fix documentation for QAccessible::InterfaceFactory Replace gluPerspective with qgluPerspective. Remove dependency of OpenGL Utility Library (GLU).
| * Fix build os QSharedPointer on MSVCOlivier Goffart2010-08-111-1/+1
| | | | | | | | | | | | Which does not support template friends Reviewed-by: Thiago
| * Fix for QTBUG-2182: "connection still in use" warnings.Kimmo Kotajärvi2010-08-111-4/+4
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1061-113/+140
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Replace gluOrtho2d with glOrtho. Optimize QSharedPointer::operator=(const QSharedPointer &) Make selection work across ligatures Fix compilation on 64-bit Windows. Fix documentation for QAccessible::InterfaceFactory Replace gluPerspective with qgluPerspective. Remove dependency of OpenGL Utility Library (GLU).
| * Replace gluOrtho2d with glOrtho.Bjørn Erik Nilsen2010-08-101-1/+1
| | | | | | | | | | | | GLU dependency was removed in commit: c67b4cac2e53ae77c4e16487838c17be85e73aa3, so instead of using gluOrtho2d we simply use glOrtho with near=-1 and far=1.
| * Optimize QSharedPointer::operator=(const QSharedPointer &)Olivier Goffart2010-08-101-1/+7
| | | | | | | | | | | | | | | | internalSet check that stringref is > 0 Which is not required as we do not assign from a QWeakPointer Reviewed-by: Thiago Task-number: QTBUG-12700
| * Make selection work across ligaturesJiang Jiang2010-08-101-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For widgets like QPlainTextEdit, selection across ligatures (typically 'fi', 'ffi', 'fl', etc.) end up highlighting the entire ligature glyphs, this patch fixed that by dividing width inside the ligature so that selection will not expand past the actual selected characters. Since cursor position already considered this, we merely adopted the algorithm and made it a separated helper function for all necessary cases. Dividing width directly looks like a temporary workaround but works well enough so far for cursor positions. Task-number: QTBUG-11969 Reviewed-by: Eskil
| * Fix compilation on 64-bit Windows.Kim Motoyoshi Kalland2010-08-101-25/+8
| | | | | | | | | | | | | | When compiling for 64-bit with Visual Studio 2008, inline assembly is not supported. Use intrisic instead. Reviewed-by: Benjamin Poulain
| * Fix documentation for QAccessible::InterfaceFactoryJan-Arve Sæther2010-08-102-6/+15
| | | | | | | | Reported to me by Martin P.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1055-59/+66
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Replace gluPerspective with qgluPerspective. Remove dependency of OpenGL Utility Library (GLU).
| | * Replace gluPerspective with qgluPerspective.Bjørn Erik Nilsen2010-08-104-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | GLU dependency was removed in commit: c67b4cac2e53ae77c4e16487838c17be85e73aa3, so we have to implement the function ourselves. Reviewed-by: kim
| | * Remove dependency of OpenGL Utility Library (GLU).Bjørn Erik Nilsen2010-08-1051-57/+52
| | | | | | | | | | | | | | | | | | | | | | | | GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-101-15/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake vcproj generator cleanup
| * | qmake vcproj generator cleanupJoerg Bornemann2010-08-101-15/+11
|/ / | | | | | | | | | | | | | | | | | | | | MSVCPROJ_CXXFLAGS removed. This was unused. MSVCPROJ_LFLAGS removed. This was used to convert the values of QMAKE_LFLAGS, QMAKE_LIBDIR and DEF_FILE to linker command line options. Then they were converted back to set values in the object model. This journey to the world of command line options isn't necessary... Reviewed-by: ossi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-109-4695/+2246
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: repair .vcxproj generation qmake: move .vcproj XML generation from data classes to VCProjectWriter qmake: remove duplicated code from VcxprojGenerator qmake: duplicated code removed from msbuild_objectmodel.cpp qmake: move XML generating code from data classes to VCXProjectWriter qmake vcxproj generator: introduce VCXProjectWriter qmake vcproj generator: introduce VCProjectWriter qmake: fix misuse of static_cast in msvc_vcproj.cpp qmake: remove some old .dsp related code from .vcproj generator qmake: remove Windows CE stuff from .vcxproj generator qmake: remove VS2003 work-around from vcxproj generator qmake: no need to add the _WINDOWS define twice qmake: useless addition of the NDEBUG define removed qmake: don't add QT_NO_DEBUG in msvc generators qmake msvc generator: remove unneeded handling of variables
| * | qmake: repair .vcxproj generationJoerg Bornemann2010-08-103-15/+17
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake: move .vcproj XML generation from data classes to VCProjectWriterJoerg Bornemann2010-08-102-203/+189
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake: remove duplicated code from VcxprojGeneratorJoerg Bornemann2010-08-103-595/+28
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake: duplicated code removed from msbuild_objectmodel.cppJoerg Bornemann2010-08-106-2638/+1060
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake: move XML generating code from data classes to VCXProjectWriterJoerg Bornemann2010-08-103-497/+431
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake vcxproj generator: introduce VCXProjectWriterJoerg Bornemann2010-08-107-574/+585
| | | | | | | | | | | | Rubber-stamped-by: ossi
| * | qmake vcproj generator: introduce VCProjectWriterJoerg Bornemann2010-08-104-397/+398
| | | | | | | | | | | | | | | | | | XML stream operator code moved to VCProjectWriter. Rubber-stamped-by: ossi
| * | qmake: fix misuse of static_cast in msvc_vcproj.cppJoerg Bornemann2010-08-101-2/+7
| | | | | | | | | | | | Reviewed-by: ossi
| * | qmake: remove some old .dsp related code from .vcproj generatorJoerg Bornemann2010-08-102-81/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removal of the following variables: MSVCPROJ_VERSION, MSVCPROJ_PROJECT, MSVCPROJ_TEMPLATE, MSVCPROJ_CONSOLE, MSVCPROJ_WINCONDEF, MSVCPROJ_VCPROJTYPE and MSVCPROJ_SUBSYSTEM. Apart from MSVCPROJ_WINCONDEF none of these variables were in use. MSVCPROJ_WINCONDEF was used to add the _WINDOWS define if CONFIG contained "windows". The _CONSOLE define was never added. Reviewed-by: ossi
| * | qmake: remove Windows CE stuff from .vcxproj generatorJoerg Bornemann2010-08-103-149/+4
| | | | | | | | | | | | | | | | | | VS2010 does not support Windows CE. Reviewed-by: ossi
| * | qmake: remove VS2003 work-around from vcxproj generatorJoerg Bornemann2010-08-103-6/+3
| | | | | | | | | | | | | | | | | | This generator is VS2010 only. Reviewed-by: ossi
| * | qmake: no need to add the _WINDOWS define twiceJoerg Bornemann2010-08-102-12/+0
| | | | | | | | | | | | | | | | | | This is already done by MSVCPROJ_WINCONDEF. Reviewed-by: ossi
| * | qmake: useless addition of the NDEBUG define removedJoerg Bornemann2010-08-102-4/+0
| | | | | | | | | | | | | | | | | | This already happens in initConfiguration. Reviewed-by: ossi
| * | qmake: don't add QT_NO_DEBUG in msvc generatorsJoerg Bornemann2010-08-102-6/+2
| | | | | | | | | | | | | | | | | | This is already done in qt.prf. Reviewed-by: ossi
| * | qmake msvc generator: remove unneeded handling of variablesJoerg Bornemann2010-08-102-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | win32/thread.prf takes care of handling the following variables: MAKE_CXXFLAGS_MT_DLLDBG MAKE_CXXFLAGS_MT_DBG MAKE_CXXFLAGS_MT_DLL MAKE_CXXFLAGS_MT No need to do that in the MSVC generators. It was incorrectly implemented anyway. Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-103-0/+94
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added QPainter::clipBoundingRect() which is significantly faster
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-103-0/+94
| |\ \ |/ / / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added QPainter::clipBoundingRect() which is significantly faster
| * | Added QPainter::clipBoundingRect() which is significantly fasterGunnar Sletta2010-08-093-0/+94
| | | | | | | | | | | | | | | | | | | | | than QPainter::clipRegion().boundingRect(). Task: http://bugreports.qt.nokia.com/browse/QTBUG-12618 Reviewed-by: Kim
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-102-36/+41
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Are custom file engines in use? Make prefix handling in file engine creation more robust Fix minor premature pessimizations in file engine creation There goes QResourceFileEngineHandler
| * | Are custom file engines in use?João Abecasis2010-08-091-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no custom file engine handlers have been registered, we can avoid using the Read/Write lock and, most of the time, we also avoid the creating the handler list at all. Since the custom handler for QResource's engine has been folded into the default handler, there should be no other internal use of this API, thus triggering this optimization by default for all users. The new flag may also in the future be exported to other modules to trigger bypassing of file engines completely. Reviewed-by: Marius Storm-Olsen
| * | Make prefix handling in file engine creation more robustJoão Abecasis2010-08-091-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and make it exit earlier, when feasible. While we could fully validate the prefix at this level, consulting Unicode tables on each character of a file name could quickly become expensive. Furthermore, we can already reap some benefits just by checking for '/' before ':'. Reviewed-by: Marius Storm-Olsen
| * | Fix minor premature pessimizations in file engine creationJoão Abecasis2010-08-091-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractFileEngineHandler ctor adds itself once to handler list, dtor should not try to be any smarter. Repeatedly calling the global static "constructor" fileEngineHandlers() could lead to additional overhead while checking for repeated construction -- that said, compilers can probably figure this one out, but being explicit shouldn't hurt. Reduce string manipulation and copying. Also, prefer QStringBuilder to building strings by hand. Reviewed-by: Marius Storm-Olsen
| * | There goes QResourceFileEngineHandlerJoão Abecasis2010-08-092-23/+7
| | | | | | | | | | | | | | | | | | There's no reason why resources can't be handled in the default handler. Reviewed-by: Marius Storm-Olsen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-060-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix some broken exports in dbus.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jan-Arve Sæther2010-08-061008-9853/+21317
| |\ | |/ |/| | | | | Conflicts: src/dbus/qdbusmacros.h
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-06261-1603/+1471
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile. Fix recursion in QScriptEngine::toScriptValue Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4 Remove usage of deprecated QScriptValue* function Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue Remove the use of deprecated qVariant* Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValue Remove the use of deprecated qFindChild(ren) Deprecated qFindChild and qFindChildren Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded char tst_qsharedpointer.cpp: fix compilation Fix compilation with QT_NO_DEBUG_STREAM QImage::fill() overloads that take QColor and Qt::GlobalColor qmake: qmakeDeleteCacheClear() function can be template now It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION Fix MS Visual C++ 6.0 references in the documentation Remove obsolete code & workarounds for unsupported versions of MS Visual C++
| * | Compile.Yoann Lopes2010-08-061-1/+1
| | | | | | | | | | | | Related to 73791fe53805f3bfad651c36fce9249441f864cd.
| * | Fix recursion in QScriptEngine::toScriptValueOlivier Goffart2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | Introduced by mistake in 4232955aa9498a5e1e4e4b3fb4662222acffe70f Reviewed-by: Yoann Lopes
| * | Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4Olivier Goffart2010-08-062-7/+9
| | | | | | | | | | | | Rev-by: dev mailing list
| * | Remove usage of deprecated QScriptValue* functionOlivier Goffart2010-08-068-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests were untouched. Regexp used: git grep -O"sed -i 's/qScriptValueFromQMetaObject *<\([^>]*\)> *(\([^&*\(),]*\))/\\2->scriptValueFromQMetaObject<\\1>()/g'" qScriptValueFromQMetaObject git grep -O"sed -i 's/qScriptValueFromValue(this, */toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueFromValue(\([^&*\(),]*\), */\\1->toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueFromValue(&\([^&*\(),]*\), */\\1.toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueToValue</qscriptvalue_cast</'" qScriptValueToValue Rev-by: dev mailing list
| * | Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, ↵Olivier Goffart2010-08-062-23/+31
| | | | | | | | | | | | | | | | | | qScriptValueFromValue Rev-by: dev mailing list
| * | Remove the use of deprecated qVariant*Olivier Goffart2010-08-06151-807/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
| * | Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValueOlivier Goffart2010-08-062-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template member equivalent should be used instead. qVariantFromValue and qVariantSetValue does not have the QT_DEPRECATED macro, as they have template specialisation which is not possible to acheive as member function. So they are called by the non-deprecated implementation. Rev-by: dev mailing list
| * | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-0665-179/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
generated by cgit v0.12 at 2024-12-02 14:46:13 (GMT)