summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-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
| * Deprecated qFindChild and qFindChildrenOlivier Goffart2010-08-062-34/+37
| | | | | | | | Rev-by: dev mailing list
| * Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded charEskil Abrahamsen Blomfeldt2010-08-066-2/+61
| | | | | | | | | | | | | | | | | | Support unicode characters which are not representable in 16 bits in QFontMetrics::inFont() to enable font selection algorithms for unicode ranges that require surrogates. Task-number: QTBUG-12638 Reviewed-by: Simon Hausmann
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-0651-518/+316
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: 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++
| | * tst_qsharedpointer.cpp: fix compilationOlivier Goffart2010-08-041-2/+0
| | | | | | | | | | | | Mistake in commit 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10
| | * Fix compilation with QT_NO_DEBUG_STREAMOlivier Goffart2010-08-041-3/+0
| | | | | | | | | | | | | | | That code should have been removed in commit 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 There is a template member operator<< in QNoDebug
| | * QImage::fill() overloads that take QColor and Qt::GlobalColorGunnar Sletta2010-08-043-0/+198
| | | | | | | | | | | | | | | | | | | | | This will break source compatibility in some cases, but only when the user has a bug in the first place, so this is preferable Reviewed-by: Eskil
| | * qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-034-11/+8
| | | | | | | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * It is no longer necessary to check for QT_NO_MEMBER_TEMPLATESminiak2010-08-0315-56/+9
| | | | | | | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATIONminiak2010-08-036-44/+2
| | | | | | | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Fix MS Visual C++ 6.0 references in the documentationminiak2010-08-034-76/+62
| | | | | | | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-0325-326/+37
| | | | | | | | | | | | | | | | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-061-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: add better support for delayed message invocation
| * | Cocoa: add better support for delayed message invocationRichard Moe Gustavsen2010-08-061-2/+6
| | | | | | | | | | | | | | | This patch will make it easier to call methods that takes integer arguments. It will be used to bugfix native dialogs.
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-058-0/+1579
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add benchmarks for QtScript's QObject binding Add benchmarks for QMetaType::construct(int type, void *copy = 0) Add benchmarks for QVariant(int type, void *copy = 0)
| * | Add benchmarks for QtScript's QObject bindingKent Hansen2010-08-052-0/+1244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The benchmarks cover the following: - Reading and writing meta-object-defined properties. - Reading and writing dynamic properties. - Reading child objects. - Reading script-defined (wrapper object) properties. - Reading prototype-inherited properties. - Calling slots (overloaded and non-overloaded, with or without implicit argument conversion). - Signal handling. Both "simple" and "complex" objects are tested. A "simple" object is an object that inherits directly from QObject, i.e. it doesn't drag with it a lot of stuff. A "complex" object is an object that has many properties and a relatively long inheritance chain (currently QPushButton is used). Reviewed-by: Jedrzej Nowacki
| * | Add benchmarks for QMetaType::construct(int type, void *copy = 0)Kent Hansen2010-08-053-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests all built-in (core and GUI) types, both default construction (copy == 0) and copy construction. The benchmarks for GUI types must go into a separate file because core tests don't (and shouldn't) link against QtGui. Reviewed-by: Benjamin Poulain
| * | Add benchmarks for QVariant(int type, void *copy = 0)Kent Hansen2010-08-053-0/+164
|/ / | | | | | | | | | | | | | | | | | | Tests all built-in (core and GUI) types, both default construction (copy == 0) and copy construction. The benchmarks for GUI types must go into a separate file because core tests don't (and shouldn't) link against QtGui. Reviewed-by: Benjamin Poulain
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-035-6/+62
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the issue of resizing a window with the Add QTextFragment::glyphs() accessor
| * Fix the issue of resizing a window with theFabien Freling2010-08-031-2/+16
| | | | | | | | | | | | raster engine on Mac OS X. Reviewed-by: Richard Moe Gustavsen
| * Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-024-4/+46
|/ | | | | | | | Add a function to retrieve fonts, glyph indexes and positions needed to visualize the text in a QTextFragment to allow converting the text of a QTextDocument to QGlyphs objects. Reviewed-by: Simon Hausmann
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-301-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Minor optimization
| * Minor optimizationSimon Hausmann2010-07-301-1/+1
| | | | | | | | | | | | Make internal qpf2 font tag array read-only. Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-301-2/+0
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qgl: enable back on mac
| * tst_qgl: enable back on macOlivier Goffart2010-07-301-2/+0
| | | | | | | | QTBUG-12138 is closed
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-292-0/+31
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Setting a timeSpec on QDateTimeEdit breaks the edit when only time is shown
| * Setting a timeSpec on QDateTimeEdit breaks the edit when only time is shownFrederik Gladhorn2010-07-292-0/+31
|/ | | | | | | | | | | Because of the time zone change we get an "overflow" in the min and max time. For example min 00:00:00 becomes 01:00:00 and max 23:59:59 becomes 00:59:59 which is an invalid time span and the displayed time gets fixed to the newly set min/max value. Autotest included. Task-number: QTBUG-12384 Reviewed-by: Gabriel
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-07-29751-8146/+18110
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (407 commits) Cherry pick fix for MOBILITY-1234 from Qt Mobility. Cherry pick fix for QTMOBILITY-408 from Qt Mobility. Cherry pick fix for MOBILITY-1194 from Qt Mobility. Fix compilation error on Symbian^4. Fix detection of OCC functionality. Cherry pick fix for MOBILITY-1194 from Qt Mobility. Fix signal emission of QDesktopWidget on Symbian. Don't run the QGL test on systems that does not have GL support. Adding missing image Fixed gcce linker error when linking against s60main built by armcc. Make it possible again to build Qt without webkit Fixed plugin build key for Symbian builds under Linux. Remove an useless assert from comp_func_SourceOver_sse2() QScriptEngineAgent: recompile all the function when installing a debugger. QScriptDeclarativeObject: we need to save the current stack pointer. QScriptValue::objectId(): do not assert if the value is not a cell Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. ...
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-28751-8146/+18110
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2810-122/+220
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cherry pick fix for MOBILITY-1234 from Qt Mobility. Cherry pick fix for QTMOBILITY-408 from Qt Mobility. Cherry pick fix for MOBILITY-1194 from Qt Mobility. Fix compilation error on Symbian^4. Fix detection of OCC functionality. Cherry pick fix for MOBILITY-1194 from Qt Mobility.
| | | * Merge commit '9814b2225b70d6b2f758e9dbe98f8e1662049b37' into oslo-staging-1Aaron McCarthy2010-07-2810-122/+220
| | | |\
generated by cgit v0.12 at 2025-02-02 13:23:45 (GMT)