summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QNAM HTTP Code: Start authorization header with capital letterMarkus Goetz2009-11-101-2/+2
| | | | | | | | HTTP header names are case insensitive, but stick to what all browsers etc. use to work around buggy servers. Task-number: QTBUG-5618 Reviewed-by: Peter Hartmann
* Fix failing sub-src targetMarius Storm-Olsen2009-11-102-5/+7
| | | | | | | | | | | | sub-src was iterating over SRC_SUBDIRS and not SUBDIRS. So, when the tools were refactored out to handle distributed builds of host tools with Electric Cloud, these tools were not included in the iteration. Adding $$TOOLS_SUBDIRS to the recurse fixes this. Also avoid setting dependencies for non-ordered builds Reviewed-by: Jason McDonald
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-11-1010-7/+845
|\
| * Add QScriptDeclarativeClassAaron Kennedy2009-11-109-6/+826
| | | | | | | | | | | | | | | | | | QScriptDeclarativeClass is a private, but exported, class used by the declarativeui module. It is very similar to QScriptClass, but slightly faster and provides a couple of "backdoor" extension mechanisms used by declarative. Reviewed-by: Warwick Allison
| * added missing include for template instantiation (in qDeleteAll)mae2009-11-101-1/+1
| | | | | | | | (cherry picked from commit d01db18696a7729b0d54af76f5224aed6750f3bb)
| * During a GC mark the scope chain of QScriptContextsAaron Kennedy2009-11-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that simply being in the scope chain of an existant frame isn't sufficient to be marked. This can lead to a QScriptContext scope chain that contains a JSObject that has been collected. For example, this code: QScriptContext *ctxt = engine->pushContext(); ctxt.pushScope(engine->newObject()); previouslyCreatedFunctionObject.call(); // causes a GC can lead to the object added to the scope chain to have become invalid. This leads to hilarity later on. Reviewed-by: Kent Hansen
* | Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| | | | | | | | | | | | | | | | If bytesReady() was called before start(), Div by Zero. Added check for this condition. Task-number:QTBUG-5300 Reviewed-by:Justin McPherson
* | Changes to low-level audio API.Kurt Korbatits2009-11-1033-212/+227
|/ | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-1033-230/+212
| | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-10260-2414/+5513
|\
| * Don't reset view if a query fails.Derick Hawcroft2009-11-091-4/+5
| | | | | | | | | | | | | | | | The view of a table gets reset if for example a query fails. However this also resets and removes the Header views of the table. A better solution visually is to keep them displayed. Task-number: QTBUG-3162
| * Dont set DontCreateNativeAncestors attribute.Denis Dzyubenko2009-11-091-1/+0
| | | | | | | | | | | | | | This fixes painting artifacts on dock widgets. It would be nice to use this attribute again once the painting is fixed. Reviewed-by: trustme
| * Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-092-4/+11
| |\
| | * QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-092-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead than when parsing the cookie header. This corrects the bug QT-2379, happening in the following sequence: parseCookie -> setCookieUrl -> toRawForm -> parseCookie where a default domain would now also have a dot prefix, and shouldn't. QT-2379 Reviewed-by: Peter Hartmann
| * | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-099-9/+27
| |\ \
| | * | Fixed pan gesture handlers in standard Qt widgets.Denis Dzyubenko2009-11-092-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Richard
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-09118-1128/+3038
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_win.cpp
| | * | | Fixes compilation warning in qbrushDenis Dzyubenko2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas
| | * | | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-066-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option allows to disable native Windows7 gestures since they require the creation of the native window handle. This partially disabled alien widgets concept and make window resizing slower and more flickery. Reviewed-by: Espen Riskedal
| | * | | Dont create native winid when not required.Denis Dzyubenko2009-11-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Windows doesn't support native gestures, we shouldn't create a native winid. Also, there is no reason to create winid on all ancestors. Reviewed-by: Trond
| * | | | Compile in 64bit with debugOlivier Goffart2009-11-091-1/+1
| | | | |
| * | | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-0971-197/+416
| |\ \ \ \
| | * | | | API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-0915-30/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: Rename numPages() -> pageCount()Marius Storm-Olsen2009-11-093-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPrintPreviewWidget wasn't following the Qt API naming convention of *Count()/set*Count(). Introduce proper function, and obsolete the old. Removed all usage of the old function in Qt. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: Rename numDigits() and setNumDigits()Marius Storm-Olsen2009-11-093-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLCDNumber doesn't follow the API convention of *Count and set*Count(). Introduce properly named functions, and obsolete the old ones. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: Rename numCols() -> colorCount()Marius Storm-Olsen2009-11-066-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name numCols is ambiguous, as sometimes it's refering to the number of columns, and sometimes the number of colors. It also does not match the typical Qt naming convention *Count(). Reviewed-by: Tom Cooksey Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-0633-129/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-067-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: QMatrix::det() -> QMatrix::determinant(), matching math3dMarius Storm-Olsen2009-11-062-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After an API review of the new math3d classes, the full name was considered better than the short version. Therefore we obsolete the short function, and introduce the longer version. Reviewed-by: Andreas Aardal Hanssen
| | * | | | API review: Add convenience functions using QMarginsMarius Storm-Olsen2009-11-066-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added the class QMargins, so we should use it wherever we deal with margins, as a convenience to the users. Reviewed-by: Andreas Aardal Hanssen
| * | | | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-094-120/+157
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| | * | | | Removing semi-colon at the end of namespaceJoão Abecasis2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... was breaking symbian-abld build.
| | * | | | Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-052-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
| | * | | | Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a serious performance issue on Symbian and not necessarily optimal on other platforms. For the time being, we'll allow the OS to read/write as much as it can. Otherwise cleaned up the code, adding checks for invalid len arguments. Task-number: QT-2347 Reviewed-by: Peter Hartmann
| | * | | | Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-042-28/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
| | * | | | QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting forever for the thread to terminate, which did not always succeed due to a Linux kernel bug. Now, we just wait for some time and then return anyway. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-5296
| * | | | | Doc: typo fixedJoerg Bornemann2009-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | More inDestructor checks.Warwick Allison2009-11-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declarative tripped these (crashes). Reviewed-by:Aaron Kennedy
| * | | | | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-094-8/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | | | | fix QWizard issues on Windows CEJoerg Bornemann2009-11-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was reproducable with the example in <QTDIR>\examples\dialogs\trivialwizard You could not push the navigation buttons using the stylus. Task-number: QTBUG-3613 Reviewed-by: thartman
| | * | | | | fixes button size for Windows mobile styleJoerg Bornemann2009-11-061-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old button sizes were just to big. For example the trivialwizard example had a minimal width that was much too wide for the screen. Task-number: QTBUG-3613 Reviewed-by: thartman
| | * | | | | compilefixes for qfeaturesThomas Hartmann2009-11-064-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice
| * | | | | | Merge file://t:/dev/qt-46-wt into widgetteamJan-Arve Sæther2009-11-084-185/+580
| |\ \ \ \ \ \
| | * | | | | | Use at() instead of operator[] for vectors and lists.Jan-Arve Sæther2009-11-071-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using operator[] can cause a deep copy if the container is not const. Some of the containers were const, but I changed all of them to use at() since its more Qt-style.
| | * | | | | | Merge branch 'cmarcelo-vertexsimplification' into 4.6Jan-Arve Sæther2009-11-072-171/+559
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'anchor-vertex-simplification' of ↵Jan-Arve Sæther2009-11-072-171/+559
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~cmarcelo/qt/cmarcelos-clone into cmarcelo-vertexsimplification
| | | | * | | | | | QGAL: avoid passing Orientation for interpolation functionsCaio Marcelo de Oliveira Filho2009-11-062-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all of the interpolation functions needed the orientation information, and the one that needs can look at the orientation of the anchor in the parameter. This simplified a little bit the function calls. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | | * | | | | | QGAL: vertex simplificationCaio Marcelo de Oliveira Filho2009-11-062-73/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some vertices are connected by anchors with size 0, which means that in practice, they represent the same point when positioning items, i.e. their distance value is the same. In those cases, we can merge the two anchors in one, that's what vertex simplification do. The algorithm is walking in the graph, merging vertices in pairs (this could be enhanced to allow groups with arbitrary number of children vertices) The vertex simplification stage happens before the anchor simplification, so it'll make less passes. Also, in some situations of redudant anchors it will allow more anchors to be simplified. This commit creates a new type of AnchorVertex, add the algorithm for vertex simplification and restoration, make sure that distribution also works with simplified vertices. Consequences: - the assert after creating a sequence might not be true anymore, it was a structural assumption that vertex simplification may destroy; - we assumed that a center anchor could appear only in the beginning or end of the candidates, because the "center vertex" always would have 3 adjacents. A mix of parallel+center and vertex simplification break that assumption. The commit deal with those consequences. We still have one limitation: vertex simplification needs to restore the graph in every invalidation (which might be caused by some child's updateGeometyry()), since a change in the sizeHint might cause a new anchor to have size 0 or a 0-sized anchor to have a different size. In the future we can track the 0 sized anchors and only restore/re-simplify when the set changes. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | | * | | | | | QGAL: allow parallel anchors simplify center anchorsCaio Marcelo de Oliveira Filho2009-11-062-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit make possible to parallelize anchors that are center anchors, i.e. that have extra constraints (stored in itemCenterConstraints). This is trivial to support since the parallel anchor will have the same size as its children, so it can just "take the place" of its children in the constraints. Restore function was added as well. To manipulate internal structures, relevant static functions were promoted to methods. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | | * | | | | | QGAL: fix leak when restoring anchorsCaio Marcelo de Oliveira Filho2009-11-061-36/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The restore algorithm had a leak, so we did not delete all the sequences and parallel anchors that were not part of the simplified graph, i.e. that were nested inside other anchors. This commit fix the leak and clean the restore function a little bit, so the recursive function is called even for Normal anchors (which are dealt accordingly). Note that the before/after information is exactly the ->from/->to information available in the anchor being looked on. Also added an assertion to document the fact that at this point (restoring anchor simplification), one of the two anchors inside a parallel anchor must be a sequence. The algorithm depends on that because you can't have two anchors with the same start and end points. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
generated by cgit v0.12 at 2025-02-16 02:54:18 (GMT)