AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,454 Commits 4 Branches 0 Tags 339 MiB
94c2745074
Commit Graph

8454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eskil Abrahamsen Blomfeldt
e99aa8b20c Make sure QFont's resolve mask is copied on compilers with C++0x support 
The QFont consists of a d pointer and a resolve mask, and they should
both be copied in the assignment operator.

Task-number: QTBUG-18921
Done-by: Friedemann Kleint
(cherry picked from commit cb5e526c6023237c36aac3446a0a18288f39f3a9)
 2011-04-29 10:12:27 +02:00
Jiang Jiang
8c90fb22c4 Fix glyph position issue with fallback fonts 
Task-number: QTBUG-18933
Reviewed-by: Eskil
(cherry picked from commit 18fcbf7ae41504324cd453ba9b9655f3e94f6495)
 2011-04-29 10:09:13 +02:00
Samuel Rødal
7dda80e1d0 Key and wheel events. 2011-04-29 09:33:50 +02:00
Eskil Abrahamsen Blomfeldt
b2db259a32 Fix crash in raster on X11 when text contains unsupported characters 
We would assume the font engine was a FT engine and do a static cast
here, which would cause a crash if the box engine was in use instead.

Task-number: QTBUG-17443
Reviewed-by: Samuel
(cherry picked from commit c9c54682bcd23598ac7a8db3b10e9f18c978e268)
 2011-04-29 09:05:26 +02:00
Eskil Abrahamsen Blomfeldt
544babaaf9 doc: Minor cleanup in QGlyphs docs 
Just a minor clean-up in the QGlyphs docs. Mainly to try to trigger
CI.

Reviewed-by: TrustMe
(cherry picked from commit 774b5b8c6a627fc90fb7382bc907db5d2e8193bf)
 2011-04-29 08:55:03 +02:00
Eskil Abrahamsen Blomfeldt
064d54b2b0 doc: Simplify language in QGlyphs docs 
Mainly to trigger CI.

Reviewed-by: TrustMe
(cherry picked from commit 1a1683c2d57debbb3e7f3ae6001eb2c8685dca02)
 2011-04-29 08:54:41 +02:00
Samuel Rødal
b68d0688fe Add resize event support to QWindow. 
(cherry picked from commit 12b4e7e5a2b18cdd23f540821e1f2785f62b0b9a)
 2011-04-28 15:40:01 +02:00
Samuel Rødal
33e1b8dda5 Remove unused parameters in hellowindow. 
(cherry picked from commit 3d7f0d967ca1e7e76087d84efc67f5247b72dae6)
 2011-04-28 15:39:57 +02:00
Samuel Rødal
f1601a4930 Added QWindow example in examples/opengl/hellowindow. 
(cherry picked from commit 712f5fe0acc7ef73117151cd8206a0d4f5d01428)
 2011-04-28 15:39:54 +02:00
Samuel Rødal
bbee0db8f9 Preliminary QWindow event delivery. 
(cherry picked from commit 28a09e668a8125cff680ab9f1e7256e7e4e34158)
 2011-04-28 15:39:52 +02:00
Jørgen Lind
290573425c QApplication: Baseclass fixup 
(cherry picked from commit 5bbdf65632feed1a2e3f30e97bcdd47950f2b8d4)
 2011-04-28 15:39:49 +02:00
Jørgen Lind
9f14dc661e Font 
(cherry picked from commit 050925ccac957dea3d4e138babdd7aa93925dffc)
 2011-04-28 15:39:46 +02:00
Jørgen Lind
9b8759284b clipboard 
(cherry picked from commit 3f5c0e26e0f8b6876c3fb4d3822df49c748b2eea)
 2011-04-28 15:39:44 +02:00
Samuel Rødal
0d12e17d25 QGuiApplication refactor in progress. 
Things are a bit broken now... At least wiggly runs :)
(cherry picked from commit 6cdcf395ffe1e051d109a45ecd71141173a4a4c0)
 2011-04-28 15:39:41 +02:00
Jørgen Lind
dd34255948 Fix QWindow::destroy 
(cherry picked from commit 00cd7aa93f916772b22c6137293c7127fe5a33b8)
 2011-04-28 15:39:38 +02:00
Jørgen Lind
dc897ca7d9 Lazy init of QWindow 
(cherry picked from commit a2c884b6d2fcc77f6aa5e7aaa0aa329f5bef0bbd)
 2011-04-28 15:39:36 +02:00
Jørgen Lind
d04aee22e7 Added a visible state to QWindow 
(cherry picked from commit 6cd96d1921af9740bf92405ae3adf466140f8923)
 2011-04-28 15:39:33 +02:00
Jørgen Lind
2a8189035f Add isWindow type to QObject 
(cherry picked from commit 77f08730b4cdb23b43471b2b29ece59e159103d7)
 2011-04-28 15:39:30 +02:00
Jørgen Lind
d72a994a06 For QWindow we need topLevelExtra to be created when we have 
native widgets
(cherry picked from commit 247088f8fe929d55832f48af3da6f7e5e80cf8a4)
 2011-04-28 15:39:28 +02:00
Jørgen Lind
d8784df713 use QObject parent logic when setting parent for QWindow 
(cherry picked from commit 2be9fdb4b58accea4078654efed49a50acf6c74d)
 2011-04-28 15:39:25 +02:00
Jørgen Lind
54ab99d5e2 Fix compile warnings 
(cherry picked from commit e7e856403f32af3e75958c0a8ab68dc37d28df83)
 2011-04-28 15:39:23 +02:00
Jørgen Lind
4eb1543337 Lighthouse: use maybetopdata instead of creating topdata for all 
widgets
(cherry picked from commit 873764aa3cfbbd87bbbb4f3224a7807d46a16fc7)
 2011-04-28 15:39:20 +02:00
Samuel Rødal
45272d5e45 Get rid of QWindow::WindowType and clean up Qt::WindowFlags instead. 
(cherry picked from commit 72176bf2a490d2f831d53a66a0987213efa60935)
 2011-04-28 15:39:03 +02:00
Samuel Rødal
96b872506a Don't create a platform window if we already have one. 
(cherry picked from commit c4dea497adc36a0be840a51c9b98177f1f4b65b2)
 2011-04-28 15:39:00 +02:00
Jørgen Lind
02d44966ba Add proper parent logic for qwidget 
(cherry picked from commit 98118fb729c39083718c220383fff462ba8eaebd)
 2011-04-28 15:38:57 +02:00
Jørgen Lind
61c6f64872 Dont call QPlatformGLContext::makeCurrent from subclass 
(cherry picked from commit fc0a6ab220ab97b8f6acf90bf04b46de513a4d96)
 2011-04-28 15:38:54 +02:00
Samuel Rødal
ef77e8b651 Added QWindowContext and got wiggly up and running with xcb. 
(cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe)
 2011-04-28 15:38:51 +02:00
Jørgen Lind
fbef41167a Make QtGui compile again.... 
Comment out stuff in QWidget::create_sys
(cherry picked from commit 1bbc6a6bb2bf1175080e7a5ba6834ff642fd47ab)
 2011-04-28 15:38:48 +02:00
Samuel Rødal
25028e3b14 QPlatformWindowFormat -> QWindowFormat fixes. 
(cherry picked from commit 4c2eba33ca0433386fa1273fb1bc14adb852d9ac)
 2011-04-28 15:38:46 +02:00
Samuel Rødal
864a2dfa9b QWindow implementation fixes. 
(cherry picked from commit 2682cb6bd76a89c8d4ae81b0dd4a77abbf987c24)
 2011-04-28 15:38:43 +02:00
Samuel Rødal
dffc816f49 Make QWindowFormat in QWindow a setter and not a constructor argument. 
(cherry picked from commit 61e0c55dd0c82031cf5cd021bf3f3537ee91b4a8)
 2011-04-28 15:38:41 +02:00
Samuel Rødal
6d28965b10 Move WindowType to QWindow. 
(cherry picked from commit cfa7dc87bc962bd0f3a43a464723d74d87f997e2)
 2011-04-28 15:38:38 +02:00
Jørgen Lind
498f938f2d Just some more on QWindow. Nothing works 
(cherry picked from commit 3acf7aa979630a57791e2a039b1b7b0b85b0aac8)
 2011-04-28 15:38:35 +02:00
Samuel Rødal
fee009bcf9 WIP Qt 5 API. 
(cherry picked from commit ad12d5babcdc2bad3f2c0fb9fd352ab79c197aa1)
 2011-04-28 15:36:28 +02:00
Gunnar Sletta
7e4abe3a5f Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2 2011-04-28 15:08:33 +02:00
Gunnar Sletta
514641bed5 QT += declarative implies += opengl too, so hardcode it to make stuff work 2011-04-28 15:07:51 +02:00
Eskil Abrahamsen Blomfeldt
07fa0ccfc4 Make QtQuick2 compile on QPA 
Moved the logic to set pixel size into the font engines to avoid
making the platform plugin interface too complex, and added a function
in QPA to make an isolated font engine based on font data. Currently
none of the QPA back-ends supports it, but it compiles and spits out
a warning if you try to create a QRawFont from data there. This isn't
used in QtQuick2 anyway.

Reviewed-by: Jiang Jiang
 2011-04-28 11:01:04 +02:00
axis
9e57cd5e6a Merged master into qtquick2. 2011-04-27 14:34:19 +02:00
Qt by Nokia
eae8fb8599 Initial import from qtquick2. 
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
 2011-04-27 14:33:44 +02:00
axis
0c637cb07b Added dependency information to the sync.profile. 2011-04-27 12:34:11 +02:00
axis
106c57c238 Add .gitignore to each module 2011-04-27 12:06:07 +02:00
Prasanth Ullattil
055a45e61d Fix the target for QtUiTools debug on Mac 2011-04-27 12:06:04 +02:00
Marius Storm-Olsen
0389278105 Only run JSC benchmarks if access to the source code 
When modularized, the benchmark test case might not have access
to the JavaScriptCore source code. So, make sure the test case
still compiles in this case.
 2011-04-27 12:06:04 +02:00
Marius Storm-Olsen
57e47f1c7e Remove not needed .pri include 2011-04-27 12:06:04 +02:00
Liang Qi
d5622b287e Add tst_headersclean for each module 2011-04-27 12:06:03 +02:00
Liang Qi
cc47cce747 Modularized tst_compilerwarnings 2011-04-27 12:06:03 +02:00
Liang Qi
6a1d5f8723 Modularized tst_bic and add some helper functions for global test 2011-04-27 12:06:03 +02:00
axis
2e1af58417 Introduced the QT.<module>.plugins variable to module profiles. 2011-04-27 12:06:02 +02:00
axis
0cdec327f2 Fixed maketestselftest after guiapplauncher was made a global test. 2011-04-27 12:06:02 +02:00
axis
74511a84ee Removed examples and demos that are no longer in qtbase. 2011-04-27 12:06:02 +02:00