summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-13129-20922/+21459
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-132-2/+2
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * All items in list should have z: 1Martin Jones2009-11-131-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-11-13123-20866/+21371
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | * | Compile.Martin Jones2009-11-131-1/+1
| | | |
| * | | docWarwick Allison2009-11-137-35/+73
| | | |
| * | | typoWarwick Allison2009-11-131-1/+1
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-139-39/+144
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Export symbols for private QmlValueType, QmlValueTypeFactory classesKai Koehne2009-11-121-2/+2
| | | | | | | | | | | | Used in Bauhaus.
| | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-125-10/+127
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-12179-1182/+2027
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Visual tests for positionersAlan Alpert2009-11-121-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | dynamic.qml covers some of the more complex memory management issues, one of which is also fixed in this commit.
| * | | | Use local includes, not those in Qt. It matters when Declarative is a moduleWarwick Allison2009-11-132-1/+3
| | | | | | | | | | | | | | | | | | | | installed after Qt.
| * | | | Do not use "QtDeclarative/XXX" style includes in declarative module code,Warwick Allison2009-11-1296-145/+145
| | | | | | | | | | | | | | | | | | | | as it breaks reinstalling the module against existing Qt.
| * | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1226-20720/+21223
| |\ \ \ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | * | | | Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-5167
| | * | | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| | | | | |
| | * | | | Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * | | | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| | * | | | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * | | | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-111-3/+11
| | |\ \ \ \
| | | * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1015-199/+584
| | | |\ \ \ \
| | | * \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-102-42/+14
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1046-228/+1087
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-0979-323/+585
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
| | * | | | | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11177-1163/+2790
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | * | | | | | | | | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-096-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again, we have fun with the C time functions on Windows CE. On Windows CE 5: the functions are declared but not defined. On Windows CE 6: the functions are neither declared nor defined. Reviewed-by: Simon Hausmann
| | * | | | | | | | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
* | | | | | | | | | | | Cleanup.Michael Brasser2009-11-136-76/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Enforce unique role names for XmlListModel.Michael Brasser2009-11-131-17/+9
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Update ParentChange + docs.Michael Brasser2009-11-123-7/+95
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-122-10/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| * | | | | | | | | | Remove accidental left over debugging outputAaron Kennedy2009-11-121-9/+2
| | | | | | | | | | |
| * | | | | | | | | | QML C++ class-in-namespace testAaron Kennedy2009-11-121-1/+2
| |/ / / / / / / / /
* | | | | | | | | | Autotests.Michael Brasser2009-11-122-3/+32
|/ / / / / / / / /
* | | | | | | | | Output error when a binding returns undefinedAaron Kennedy2009-11-111-1/+12
| | | | | | | | |
* | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-11173-1166/+1997
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-11173-1166/+1997
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Documentation: Adding comments to QHoverEvent classMorten Engvoldsen2009-11-101-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explaining the difference between hover events and enter/leave/move events Task-number: QT-1116 Reviewed-by: Bjørn Erik Nilsen
| | * | | | | | | exporting QGraphicsEffectSource is requiredDaniel Molkentin2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3MainWindow and Q3TitleBar depend on it. Reviewed-By: dt Reviewed-By: Alessandro Portale
| | * | | | | | | Qt covers BC break in SymbianAlessandro Portale2009-11-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround: fntstore.h has an inlined function 'COpenFont* CBitmapFont::OpenFont()' that returns a private data member. The header will change between minor SDK versions, thus break BC. But Qt has to build on any SDK version and run on other versions of Symbian OS. Also Qt does not want to deliver that BC to Qt based apps. This hack performs the needed pointer arithmetic to get the right COpenFont* pointer, no matter if the 'Flexible Memory Model' is already supported or not. The author is not proud of this commit. Task-number: QT-2250 Reviewed-by: Iain Reviewed-by: Shane Kearns modified: src/gui/text/qfontdatabase_s60.cpp
| | * | | | | | | Removed unused public Api from QS60StyleAlessandro Portale2009-11-106-85/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
| | * | | | | | | Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-101-1/+11
| | | | | | | | |
| | * | | | | | | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1010-74/+144
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| | | * | | | | | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-099-90/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| | | * | | | | | | Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| | * | | | | | | | Improvements to graphics effects API after review round.Samuel Rødal2009-11-1013-201/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
| | * | | | | | | | BT: JavaScriptCore makes applications crash on leopardRichard Moe Gustavsen2009-11-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScriptCore checks the Mac OS version when building, and uses symbols only defined in i e.g.snow leopard when building on snow leopard. This means that if you build Qt on snow leopard and later move it to leopard, applications will crash looking for a missing symbol (pthread_setname_np in particular). In Qt, we garuantee that you can run your applications on 10.4 and up for Carbon, and 10.5 and up for Cocoa. So using compile time checks this way is not a proper soulution. Result: In Qt, never use symbols not defined on all supported OS versions, or at least implement run-time checks. Rev-By: Simon Hausmann Rev-By: Tor Arne Rev-By: MortenS
generated by cgit v0.12 at 2025-01-21 09:17:37 (GMT)