summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-1013-16/+21
| | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-062-4/+7
|\
| * Resolved tst_QCssParser::extractFontFamily_data on jackychanOlivier Goffart2009-08-061-2/+5
| | | | | | | | That machine has no 'Times New Roman' the test was reliying in
| * Update baseline (project.ts.result) for the good:backslashes case.Jan-Arve Sæther2009-08-061-2/+2
| |
* | Add hints that a qmake generated .pro will need to be editedKeith Isdale2009-08-062-1/+5
|/ | | | | | | | | | When qmake run with the -project option to generate a .pro for the project it is possible that the generated .pro file will need to be edited and add variables such as "QT" to specify what QT modules the project needs. To hints to qmake's help and HTML documentation to that effect. Reviewed-by: Marius Storm-Olsen
* Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-063-5/+4
|
* Merge commit 'origin/4.5'Rohan McGovern2009-08-0644-212/+283
|\ | | | | | | | | | | | | | | Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
| * Cleaned up test naming and platform-specific tests.Rohan McGovern2009-08-0632-201/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When an autotest fails to compile, there's no way to determine which testcase(s) have been prevented from running. Our results parsing tools have been guessing, under the assumption that a directory called `qdogwalker' always contains a testcase named `tst_qdogwalker'. That wasn't true for all our tests, so let's make it true. Also changed the platform-specific tests so that qmake will simply skip those tests on unsupported platforms, instead of wasting time compiling a useless QTEST_NOOP_MAIN test.
| * Fix a bug when activating HideNameFilterDetails on Windows filedialog.Alexis Menard2009-08-052-11/+19
| | | | | | | | | | | | | | | | | | | | The HideNameFilterDetails was not taken in account for windows file dialog. This patch fix that. For Windows Vista and later we use now the new COMMON_ITEM_DIALOG API (in master) where it add always the filter extension like *.txt so no point to take that flag in account. Task-number: None, during testing Reviewed-by: prasanth
| * Fix compilation on AIX: -I/usr/include cannot be used.Thiago Macieira2009-08-051-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that the C++ compiler needs to add -I/usr/vacpp/include before -I/usr/include, so our adding of -I/usr/include changes the order. This causes a compilation error in the C++ header xlocinfo.h. In any case, these checks done in qmake are unnecessary. If the OpenSSL headers are in one of those include paths, they will be found on their own already. Reviewed-By: Bradley T. Hughes (cherry picked from commit 04f7834fcd8db4ecb6a4c53de42ac83f571b37c8)
| * Fix compilation when QT_NO_HTTP is definedMarkus Goetz2009-08-058-5/+18
| | | | | | | | | | | | | | | | Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
| * Fixes hangup when pressing key in QListWidgetOlivier Goffart2009-08-052-1/+29
| | | | | | | | | | | | | | | | | | If there is severals matching items but all of them are disabled, it would have produced an infinite loop. Block the loop once we reach an already matched item. Task-number: 258949 Reviewed-by: Thierry
| * Cocoa: Menus show old selected values.Richard Moe Gustavsen2009-08-052-1/+29
| | | | | | | | | | | | | | | | | | | | We never told Cocoa that it needed to redraw the window view when a window was shown. This is implicit if the window is shown for the first time, but needs to be done explicit if you hide and show it again. Task-number: 254672 Reviewed-by: bnilsen
* | Make QLineEdit cursor blink againAlan Alpert2009-08-061-0/+3
| | | | | | | | | | | | | | Somehow forgot to hook up the blinking signal (in the new QLineControl) to QLineEdit. Reviewed-by: Trust Me
* | Compile Fix for QT_KEYPAD_NAVIGATIONAlan Alpert2009-08-067-11/+29
| |
* | Adds qgraphicsgridlayout & qgraphicstransform to autotest buildLeonardo Sobral Cunha2009-08-051-16/+18
| | | | | | | | | | | | Also removed tabs from auto.pro Reviewed-by: trustme
* | cetcpsync: unneeded error message removedJoerg Bornemann2009-08-051-1/+2
| | | | | | | | | | If file deletion fails then I don't want to know it. cetest tries to delete files more than once.
* | Doc: fix qdoc errors in QSharedPointer documentation.Thiago Macieira2009-08-052-2/+3
| | | | | | | | | | | | | | | | | | | | I added the documentation to QWeakPointer::data, but I forgot to declare the class in the qdoc stub. Also, apparently I cannot link to a specific overload of a given function. Reviewed-by: Volker Hilsheimer
* | Autotest: add QSharedPointer and QWeakPointer tests for QWidget tooThiago Macieira2009-08-053-1/+155
| | | | | | | | | | | | | | | | I don't want to link the tst_qsharedpointer test to QtGui, so I created a new test. This is testing only the basic manipulations. In special, it's not testing invalid constructs.
* | Restore symmetry between QSharedPointer and QWeakPointer on QObjects.Thiago Macieira2009-08-054-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous commit, you could create a QWeakPointer from any QObject-derived object. It's possible because QObject now has a pointer to the QWeakPointer's d-pointer. However, if you did: QSharedPointer<QObject> obj(new QObject); QWeakPointer<QObject> weak1(obj); QWeakPointer<QObject> weak2(obj.data()); Then weak1 would shared d-pointers with QSharedPointer, but weak2 wouldn't. Also, weak1.toStrongRef() would work, but weak2.toStrongRef() wouldn't. This change makes QObject know where the d-pointer created by QSharedPointer is, so weak2 would get the same d-pointer. As a nice side-effect, you can check if a given QObject is shared by trying to promote its QWeakPointer to QSharedPointer. Reviewed-by: Bradley T. Hughes
* | Performance improvements by avoiding creation of temporary QSharedPointers ↵Thiago Macieira2009-08-051-43/+25
| | | | | | | | with d=value=0
* | Add support for using QWeakPointer with QObject, replacing QPointer.Thiago Macieira2009-08-055-5/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with QPointer is that it's a simple QObject*. So the only way for QPointer to do what it's supposed to do is if the object it's pointing to clears all QPointers when getting deleted. That means the QObject must know each and every QPointer pointing to it. To make matters worse, QPointers can be deleted while the object they're pointing to also gets deleted. So deleting QObjects must do locking. The solution to the QPointer problem is that both QObject and the "QPointer" reference something outside the QObject. This way, QObject doesn't have to lock anything to destroy itself: it's simply setting a volatile integer to zero when it gets deleted. Since the integer is outside the QObject, the integer is also refcounted. It's also O(1), so there's no problem having as many "QPointer". The two-atomic-ints structure is exactly what QSharedPointer and QWeakPointer use internally. We just abuse this structure for QObject needs, setting the strong reference count to -1 to indicate that it's a QObject that cannot be managed by a QSharedPointer. But QWeakPointer can still work and replace QPointer neatly. Reviewed-by: Bradley T. Hughes Reviewed-by: Jarek Kobus
* | ItemViews: make it possible for chekcable items to get partiallyCheckedThierry Bastian2009-08-052-2/+13
| | | | | | | | | | | | | | Previously it was only switching between checked and unchecked. Task-number: 259008 Reviewed-by: ogoffart
* | QTapAndHoldGesture is gone, remove referenceVolker Hilsheimer2009-08-051-1/+1
| |
* | Fix failing autotest tst_QPlainTextEdit::lineWrapModes()mae2009-08-051-1/+6
| | | | | | | | | | | | QPlainText edit does lazy line wrapping only for the visible blocks. Resizing the editor in the auto test thus has to make it wide enough that at least some characters are visible for the block to be laid out.
* | Fix compilation for compilers that don't have template friends.Thiago Macieira2009-08-051-1/+0
| | | | | | | | | | | | | | GCC has template friends, so I wasn't seeing the error that d is protected. Thanks to Robert for pointing out. Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* | cetest compile fixJoerg Bornemann2009-08-051-2/+3
| | | | | | | | Reviewed-by: TrustMe
* | Fixed setting a style shet on a QSpinBox to change the arrow possitionOlivier Goffart2009-08-052-4/+87
| | | | | | | | | | | | | | If you only set the position, of the button without setting a geometry, it did not work. Task-number: 259226
* | Fix regressions introduced by 31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759Alexis Menard2009-08-053-5/+54
| | | | | | | | | | | | | | | | | | | | The commit 31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759 introduced regressions in filters which breaks the mac native dialog, the non native dialog with HideNameFilterDetails activated. Task-number:259105 Reviewed-by:olivier Reviewed-by:prasanth
* | MainWindow: fixed an update issue when moving a separatorThierry Bastian2009-08-051-0/+3
| | | | | | | | | | | | A non painted (ie. garbage) area could appear if you had a fixed size dock widget and you moved the separator. The previous place where the separator was painted was not updated
* | Re-enable the use of Common Item DialogPrasanth Ullattil2009-08-051-1/+3
| | | | | | | | | | | | This was disabled by patch bf305bc2e488ad4f08c49767246f31a81218991e Reviewed-by: Thomas Hartmann
* | small cleanup in cetestJoerg Bornemann2009-08-052-17/+18
| | | | | | | | Reviewed-by: TrustMe
* | missing license header added in cetcpsyncsvrJoerg Bornemann2009-08-051-0/+40
| | | | | | | | Reviewed-by: TrustMe
* | Workaround a crash in qdoc.Volker Hilsheimer2009-08-051-0/+5
| | | | | | | | Caused by an odd number of classes it seems.
* | initial revision of cetcpsyncJoerg Bornemann2009-08-056-0/+996
| | | | | | | | | | | | | | This is the desktop client for communicating with a Windows CE device that runs the cetcpsync server. Reviewed-By: mauricek
* | initial revision of cetcpsyncserverJoerg Bornemann2009-08-057-0/+1398
| | | | | | | | | | | | | | cetcpsync is our simple ActiveSync replacement for Windows CE devices. This is the server which has to run on the device. Reviewed-By: mauricek
* | cetest: add support for cetcpsync (our simple ActiveSync replacement)Joerg Bornemann2009-08-055-7/+305
| | | | | | | | Reviewed-By: mauricek
* | QMenu: fix a crash depending on stylesThierry Bastian2009-08-051-9/+13
| | | | | | | | | | We were calling pixelMetric and sizeFromContents with a NULL styleoption That crashes on mac and might also with other styles.
* | Make \annotatedlist <group> work also in pages that are not \group pages.Volker Hilsheimer2009-08-051-9/+6
| | | | | | | | | | | | The command right now only lists the classes in the group, in alphabetical order. Not ideal for integrating into overviews, where the list should be ordered by relevance.
* | sequential animation group: add autotest for pause/resumeThierry Bastian2009-08-051-0/+36
| |
* | qdoc: Removed the "No such group" qdoc error.Martin Smith2009-08-051-0/+2
| | | | | | | | | | | | | | | | This error was printed if you used a \ingroup xxx, but there was no \group xxx anywhere. Now we will stop using the \group command, but we will retain the \ingroup command for use with the \annotatedlist command.
* | Add benchmark for deleting an item with many children.Andreas Aardal Hanssen2009-08-051-0/+11
| | | | | | | | | | Task-number: 229124 Reviewed-by: TrustMe
* | Add benchmarks for QGraphicsItem::setParenItem().Andreas Aardal Hanssen2009-08-052-1/+26
| | | | | | | | | | | | | | | | | | | | Ensure we test simple and deep constructs of setParentItem(). These benchmarks don't cover slowness in ancestor flag updating. QVariant is already identified as a contributor to this slowness, as is updating of the depth value (a deep tree crawl). Reviewed-by: Aaron Kennedy
* | Compile fix (QGraphicsItem::setXRotation was removed).Andreas Aardal Hanssen2009-08-051-13/+1
| | | | | | | | | | | | | | a6ea9ce6990003856ecadcca8ce9ddf37949363d removed this function; the benchmark was not updated. Reviewed-by: TrustMe
* | Merge AudioServices into mainline.Justin McPherson2009-08-0588-2/+12950
| |
* | Merge branch '4.5'Bill King2009-08-0511-19/+71
|\ \ | |/ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Get more database tests working/passing.Bill King2009-08-052-4/+18
| |
| * Make file extension case insensitive with the Gtk+ file dialogJens Bache-Wiig2009-08-041-1/+18
| | | | | | | | | | | | | | | | | | | | | | The Qt dialog treats extension filters as case insensitive where the default behavior of the Gtk+ file dialog is to be case sensitive. The GtkFileFilter allows only simple glob syntax to be used so we basically rewrite the extension string from .xyz to .[xX][yY][zZ]. Task-number: 259155 Reviewed-by: joao
| * Fix: Gtk native dialogs do not repaint when zero-timers are usedJens Bache-Wiig2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | The problem was that our glib timers were given too high priority, effectively starving the Gtk event loop. By assigning our timer source, G_PRIORITY_DEFAULT_IDLE we ensure that all gtk+ events are handled first, thus allowing the native dialogs to respond and repaint properly. Task-number: 258433 Reviewed-by: bhughes
| * Fix indentation.Alexis Menard2009-08-041-1/+3
| | | | | | | | Reviewed-by:TrustMe