qt:qttools.git
5 years agoremove QT+=widgets from SUBDIRS projects
Oswald Buddenhagen [Fri, 14 Dec 2012 19:23:58 +0000 (20:23 +0100)]
remove QT+=widgets from SUBDIRS projects

it makes no sense whatsoever

Change-Id: Ida65c7fb02e53bd3d1ccb319bdbcbec4c836b871
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove obsolete DEPENDPATH assignments
Oswald Buddenhagen [Fri, 14 Dec 2012 19:09:35 +0000 (20:09 +0100)]
remove obsolete DEPENDPATH assignments

qmake now adds CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove some unnecessary CONFIG additions
Oswald Buddenhagen [Fri, 14 Dec 2012 18:40:12 +0000 (19:40 +0100)]
remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

Change-Id: I0f6429ef61b73b9d57b9f1fc08b789d39e5b99c0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoActiveQt documentation is not registered in Qt Assistant.
kh1 [Fri, 14 Dec 2012 11:11:49 +0000 (12:11 +0100)]
ActiveQt documentation is not registered in Qt Assistant.

Task-number: QTBUG-28609

Note: there's already an task to add files based on its extension, see
QTBUG-28345. Cause this might introduce more regression we decided to
go the whitelist route for the 5.0.0 release and fix it the next minor.

Change-Id: Ia1f72e0ed39746fca203813bfe8523fd9956fb61
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoFix position of rendered QAxWidget in designer preview
Miikka Heikkinen [Fri, 14 Dec 2012 10:58:17 +0000 (12:58 +0200)]
Fix position of rendered QAxWidget in designer preview

Added correct offset to render call.

Task-number: QTBUG-28595
Change-Id: Iab9fecdcf48c8f72fe28ac1cae72bcd2ea5830e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoAdded hardcoded url to Designer Manual
Nico Vertriest [Tue, 11 Dec 2012 11:32:22 +0000 (12:32 +0100)]
Added hardcoded url to Designer Manual

Workaround to QTBUG-28500

Change-Id: I523d7296ac6a1b8ead5ceeed6af2937e7034abdf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoLink only minimal qpa plugin to qhelpgenerator in static build
Miikka Heikkinen [Wed, 12 Dec 2012 11:34:03 +0000 (13:34 +0200)]
Link only minimal qpa plugin to qhelpgenerator in static build

Task-number: QTBUG-28131

Change-Id: I4da2cae750701125d63b934b2bc0d66c788638f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDoc: fix the Qt Linguist example page v5.0.0-rc2
Leena Miettinen [Wed, 12 Dec 2012 08:12:49 +0000 (09:12 +0100)]
Doc: fix the Qt Linguist example page

Use the \group and \ingroup commands to have qdoc
list the examples. Edit the \brief contents.

Change-Id: Iae0769bd1272b03d94b9287b9fddf78df27e1f12
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agoQtTools: Doc: Added missing image to uitools examples.
David Schulz [Wed, 12 Dec 2012 07:27:00 +0000 (08:27 +0100)]
QtTools: Doc: Added missing image to uitools examples.

Change-Id: I6e0144ef2ded5e7dd95b332436a9a7dcbbcfc6fb
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
5 years agoDoc: Fix example pages for Qt Tools
Leena Miettinen [Tue, 11 Dec 2012 16:31:48 +0000 (17:31 +0100)]
Doc: Fix example pages for Qt Tools

Use the \group and \ingroup commands to produce Qt 5 style
example pages. Unify the file structure for example docs.
Add example page for Qt Help and move Context Sensitive Help
example to it (from the Qt Assistant Examples page).

Change-Id: I687b18a134037588a5a536fe2353c18dfd44b1d7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agomake qtbase source requirement explicit
Oswald Buddenhagen [Fri, 7 Dec 2012 19:00:00 +0000 (20:00 +0100)]
make qtbase source requirement explicit

getting rid of QT.<module>.sources references, as they don't go well
with real modularization.

Change-Id: Idfe0327b00be173e2c2a0b4fc4d2c50de7c2dbe8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agomake use of qt_headersclean.prf
Oswald Buddenhagen [Thu, 6 Dec 2012 16:26:02 +0000 (17:26 +0100)]
make use of qt_headersclean.prf

Change-Id: I20a8c472114c9343562fff3ddefae5113cdaeb52
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoEntered hardcoded url for Plural Form in Translation
Nico Vertriest [Tue, 11 Dec 2012 14:45:00 +0000 (15:45 +0100)]
Entered hardcoded url for Plural Form in Translation

Task-number: QTBUG-27512

Corrected in linguist-manual.qdoc

Change-Id: I42a1e618dfd4c09f8f8956fe8df574ef09637d36
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoQtTools: Fixed install targets for examples.
David Schulz [Tue, 11 Dec 2012 14:02:20 +0000 (15:02 +0100)]
QtTools: Fixed install targets for examples.

Change-Id: Id930c26beecb3e49ccfb3595bb96a03576f9cd82
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQtTools: Doc: Removed example dir from the qdocconf
David Schulz [Tue, 11 Dec 2012 13:23:06 +0000 (14:23 +0100)]
QtTools: Doc: Removed example dir from the qdocconf

... because the examples were double build.

Change-Id: I4b6f6ba937f52223dd30eb78fc814646200bbec3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoDoc: add missing files for Qt UI Tools docs
Leena Miettinen [Tue, 11 Dec 2012 11:46:17 +0000 (12:46 +0100)]
Doc: add missing files for Qt UI Tools docs

The files were ignored by Git, so they did not get
submitted as part of I156dbf0a071137e1e6f3ba99cc390aa88c80b836.

Change-Id: Icb3a35d24993ea77077ee3a2e09f347c48c583bd
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agoQtTools: Doc: Fixing links in designer and assistant.
David Schulz [Tue, 11 Dec 2012 12:55:46 +0000 (13:55 +0100)]
QtTools: Doc: Fixing links in designer and assistant.

Change-Id: I98ff1c2dd615cbe3a79f19bada8964082ce8f21f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoDoc: Fixing typo in landing page file name.
Jerome Pasion [Tue, 11 Dec 2012 11:30:48 +0000 (12:30 +0100)]
Doc: Fixing typo in landing page file name.

Change-Id: I24ad7c50437d4cbbdcd95d9df5a63693d213aaa5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoRemove scripting getter/setter of QUiLoader.
Friedemann Kleint [Mon, 10 Dec 2012 16:27:26 +0000 (17:27 +0100)]
Remove scripting getter/setter of QUiLoader.

Scripting in QUiLoader was an experimental feature in Qt 4.8 whose
implementation was removed in
159c3d35d41a121f9cbf55631aebbd309b683811 .

Change-Id: I325ca032033659a03df4ab83f642b6a9b15f5590
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoQtTools: Doc: Added picture for uitools.
David Schulz [Tue, 11 Dec 2012 08:46:20 +0000 (09:46 +0100)]
QtTools: Doc: Added picture for uitools.

Change-Id: I922772f91a5d6c131d7896a1026ddb023649bd48
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoDoc: modularize Qt Designer custom plugin docs
Leena Miettinen [Mon, 10 Dec 2012 09:44:00 +0000 (10:44 +0100)]
Doc: modularize Qt Designer custom plugin docs

Create index and module pages for Qt Designer custom
plugin classes. Modify the qdocconf file to also build
the Qt Designer plugin class docs. Move snippets from
qtdoc to qttools. Fix links to the classes page in example docs.

Change-Id: Ie191fdb07fb0b00379a15d44c1355f00815053e6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agoDoc: Modularize Qt UI Tools documentation
Leena Miettinen [Mon, 10 Dec 2012 16:05:31 +0000 (17:05 +0100)]
Doc: Modularize Qt UI Tools documentation

Move the Qt UI Tools examples and example docs to qttools.
Create index, module, and example pages and a qdocconf file.
Fix links to module documentation (index page). Fix links to
snippets and examples. Add the command to build docs to the
project file.

Change-Id: I156dbf0a071137e1e6f3ba99cc390aa88c80b836
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoAdd PLUGIN_CLASS_NAME to qttools plugins
Miikka Heikkinen [Mon, 10 Dec 2012 12:58:39 +0000 (14:58 +0200)]
Add PLUGIN_CLASS_NAME to qttools plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: I4e7c7b5342c7dde99580d42100c8b9d89b809515
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDoc: Modularize Qt Help docs
Leena Miettinen [Fri, 7 Dec 2012 15:24:23 +0000 (16:24 +0100)]
Doc: Modularize Qt Help docs

Add index and module pages for Qt Help, add a qdocconf file,
and move snippets. Add doc build command to help.pro.

Task-number: QTBUG-28449

Change-Id: Ic022693d82ee3664bf57e708df89c4a71aadb78e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoQtTools: Add example page for assistant.
David Schulz [Fri, 7 Dec 2012 13:16:31 +0000 (14:16 +0100)]
QtTools: Add example page for assistant.

Change-Id: I1f15f3db46206731da7741554cc128620af7f652
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agofollow move of cmake file templates
Oswald Buddenhagen [Thu, 6 Dec 2012 15:29:34 +0000 (16:29 +0100)]
follow move of cmake file templates

Change-Id: I712dc95c62597064acf60ecc594638c3a69ff8e8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoDoc: Replace outdated macro from docs
Christian Stenger [Fri, 7 Dec 2012 09:47:00 +0000 (10:47 +0100)]
Doc: Replace outdated macro from docs

Change-Id: I525c1322a46115f64fe94d48a0ebc2d4fb2e2e12
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agodoc: Remove old information about Qt Linguist 4.3 and Windows Vista
Sergio Ahumada [Fri, 7 Dec 2012 09:49:44 +0000 (10:49 +0100)]
doc: Remove old information about Qt Linguist 4.3 and Windows Vista

Remove old text about Qt Linguistic being certified for Windows
Vista. Also removed the Windows Vista image.

Change-Id: Ie8fde974e0666f48dd86f691c3c2745a252549bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agoRemove dependency to ActiveQt sources in designer plugin.
Miikka Heikkinen [Wed, 5 Dec 2012 14:00:30 +0000 (16:00 +0200)]
Remove dependency to ActiveQt sources in designer plugin.

Seems that building using qaxtypes.* directly from qtactiveqt repo
is unnecessary, so remove them.

Task-number: QTBUG-26848
Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQtTools: Fix example names after adjusting exampledirs
David Schulz [Thu, 6 Dec 2012 13:22:30 +0000 (14:22 +0100)]
QtTools: Fix example names after adjusting exampledirs

Change-Id: I00f60412346c85de044eb784a36f98a12c4ccd05
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoQtTools: Doc: Moved assistant examples
David Schulz [Thu, 6 Dec 2012 10:34:35 +0000 (11:34 +0100)]
QtTools: Doc: Moved assistant examples

... and changed exampledirs in the qdocconf files
to the appropriate modules.

Change-Id: Ic15d9fc845d59fb4e84ee39a52e457666fa09e51
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoMake kmap2qmap compile again
Paul Olav Tvete [Tue, 4 Dec 2012 12:05:34 +0000 (13:05 +0100)]
Make kmap2qmap compile again

Task-number: QTBUG-28165

Change-Id: I46dc5c05f6f4d6079ec53a94abda0351cdfb5f83
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoDoc: move a Qt Designer howto to qttools
Leena Miettinen [Thu, 6 Dec 2012 08:59:14 +0000 (09:59 +0100)]
Doc: move a Qt Designer howto to qttools

One more file was missing from the modularization:
Creating and Using Components for Qt Designer. The links to
images in the file were consequently broken.

Change-Id: I7ae9f7efd74acc3dc030999796afcbaa48110696
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoQtTools: Doc: Fix lots of links in the designer manual.
David Schulz [Wed, 5 Dec 2012 15:01:26 +0000 (16:01 +0100)]
QtTools: Doc: Fix lots of links in the designer manual.

Change-Id: I7ae1e9b56f6066798ca8620d96bf42f991b1064d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoChange project names in tools' qdocconf file v5.0.0-rc1
hjk [Wed, 5 Dec 2012 12:17:25 +0000 (13:17 +0100)]
Change project names in tools' qdocconf file

This triggers generation of suitable qthelp:// urls in the example manifests

Change-Id: Ibecd48fa7854e9916cc7b0a2e33569935d387c69
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoQtTools: Remove reference to lupdate and lrelease
David Schulz [Wed, 5 Dec 2012 11:01:03 +0000 (12:01 +0100)]
QtTools: Remove reference to lupdate and lrelease

... in the linguist manual.

Change-Id: I26f4289760f3b70c1f7815872b86e33fe94718f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agofix installation target paths of examples
Joerg Bornemann [Tue, 4 Dec 2012 16:41:06 +0000 (17:41 +0100)]
fix installation target paths of examples

Change-Id: I11440d60a709cbe4617aa0953c7971a6d731b73b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoleverage qt_example_installs.prf
Joerg Bornemann [Wed, 5 Dec 2012 10:00:37 +0000 (11:00 +0100)]
leverage qt_example_installs.prf

Change-Id: Ie6b02fd48aaa6b303629bb8e66cfe567aa8ca7df
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoAdd \brief description to tools examples.
hjk [Wed, 5 Dec 2012 11:48:16 +0000 (12:48 +0100)]
Add \brief description to tools examples.

Change-Id: I713620c8c5cf55147b1c5732d745569916a8e264
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoChange copyrights from Nokia to Digia
Sergio Ahumada [Tue, 4 Dec 2012 19:59:25 +0000 (20:59 +0100)]
Change copyrights from Nokia to Digia

Change-Id: I118a50ef99e42878c01e1ee509c2bf86c70ec05d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoQt Linguist: Fix help URL.
Friedemann Kleint [Tue, 4 Dec 2012 15:09:02 +0000 (16:09 +0100)]
Qt Linguist: Fix help URL.

Task-number: QTBUG-28373

Change-Id: I1c5929ffee32843867d2401a23386545f36b9bcc
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoQt Designer: Fix help URLs.
Friedemann Kleint [Tue, 4 Dec 2012 15:02:19 +0000 (16:02 +0100)]
Qt Designer: Fix help URLs.

- Fix building of URLs.
- Correct URLs of manual and style sheet manuals
- Remove the 'What's new' option.

Task-number: QTBUG-28373
Change-Id: I4d1dfd6154f799e9bb00c0a75aa62a7239b0f81f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDoc: add example pages for Qt Designer and Qt Linguist
Leena Miettinen [Tue, 4 Dec 2012 14:36:42 +0000 (15:36 +0100)]
Doc: add example pages for Qt Designer and Qt Linguist

Move the example landing pages from example.qdoc in qtdoc
to the appropriate places in qtdoc.

Change-Id: Ieb5a2b001b1e20940903f3e53856bcbf8138ed76
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoQtTools: Fix some links to Qt Linguist Manual.
David Schulz [Tue, 4 Dec 2012 14:53:35 +0000 (15:53 +0100)]
QtTools: Fix some links to Qt Linguist Manual.

Change-Id: I749a522894ae30219d1579d1d78456c944912204
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:33:36 +0000 (11:33 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: I25e8206d8df8f69ffc5c282487e5d8af22e6b690
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agoremove symbian vestiges
Oswald Buddenhagen [Mon, 3 Dec 2012 20:49:26 +0000 (21:49 +0100)]
remove symbian vestiges

Change-Id: I75296c5bb0ebc1006a2b28d2041bdccaa7023e94
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoAdd all new doc files we have for Qt5.
kh1 [Mon, 3 Dec 2012 16:15:52 +0000 (17:15 +0100)]
Add all new doc files we have for Qt5.

Change-Id: I8079a612ff18eba07134224cb982fc512ce5c429
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoFix build of the Designer QAxWidget plugin.
Friedemann Kleint [Mon, 3 Dec 2012 14:54:29 +0000 (15:54 +0100)]
Fix build of the Designer QAxWidget plugin.

Change-Id: I8a1e08c627f7697ca4449f0c33b1ecbda08257b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoDoc: fix issues in the Qt Linguist docs
Leena Miettinen [Mon, 3 Dec 2012 08:47:05 +0000 (09:47 +0100)]
Doc: fix issues in the Qt Linguist docs

Fix the issues listed here:
http://community.kde.org/Qt5/Documentation/OverviewClassification

Do some editing. More editing will be done later, and the QML info
will be integrated to the manual.

Change-Id: I73d3ebbd3a12ff427e7f57ba9350fa4059216100
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoWe check pointer after use it. Found with cppcheck.
Montel Laurent [Fri, 30 Nov 2012 13:49:46 +0000 (14:49 +0100)]
We check pointer after use it. Found with cppcheck.

Change-Id: I06b6006e122c3bba7144251e85c8c3616e5369da
Reviewed-by: David Faure <david.faure@kdab.com>
5 years agoQtTools: Remove reference to deprecated Q_EXPORT_PLUGIN2
David Schulz [Fri, 30 Nov 2012 13:42:20 +0000 (14:42 +0100)]
QtTools: Remove reference to deprecated Q_EXPORT_PLUGIN2

Change-Id: Ic553855393b23c8d1817e40bdff7bd219c395caf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoremove obsolete .desktop files
Oswald Buddenhagen [Wed, 28 Nov 2012 15:08:05 +0000 (16:08 +0100)]
remove obsolete .desktop files

Change-Id: I2a4974229c18b5ad4d18089fc076d86457557cc1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoDoc: move Qt Linguist example docs from qtbase to qttools
Leena Miettinen [Fri, 30 Nov 2012 15:14:14 +0000 (16:14 +0100)]
Doc: move Qt Linguist example docs from qtbase to qttools

Move qdoc files, images, and snippets.

Change-Id: I6ab84892dc56c23bfd056faa0713a572c814a1c2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoChange copyright information from Nokia to Digia
Sergio Ahumada [Fri, 30 Nov 2012 11:31:00 +0000 (12:31 +0100)]
Change copyright information from Nokia to Digia

In addition, some QUrl changes were required as I had to
re-genegerate test.qch

Change-Id: I03f6b3ab4a0743244fc93af92b024a084d4b7a15
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoDoc: move Qt Designer example docs, images, and snippets to qttools
Leena Miettinen [Fri, 30 Nov 2012 10:03:36 +0000 (11:03 +0100)]
Doc: move Qt Designer example docs, images, and snippets to qttools

Change-Id: Ib02369b0a3970432685e5eb5e271902f399fab7e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
5 years agoRename linguist.qdocconf to qtlinguist.qdocconf
hjk [Fri, 30 Nov 2012 13:59:54 +0000 (14:59 +0100)]
Rename linguist.qdocconf to qtlinguist.qdocconf

Follow suit with the other tools.

Change-Id: I17d9216d66a92d16c0cc7c9e8794a817b98dff21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRename designer.qdocconf in qtdesigner.qdocconf
hjk [Fri, 30 Nov 2012 13:25:31 +0000 (14:25 +0100)]
Rename designer.qdocconf in qtdesigner.qdocconf

This is consistent with assistant.

Change-Id: Iaf61e800ae0e383d4f34bf95949895856c491f7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoQHelpGenerator: Allow launch without window manager
Kai Koehne [Fri, 30 Nov 2012 10:01:02 +0000 (11:01 +0100)]
QHelpGenerator: Allow launch without window manager

Use the minimal plugin by default.

Change-Id: I2aa08c0ffcc76ce8692b481efb25497649b9b1d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDoc: Fix issues in Qt Designer docs
Leena Miettinen [Thu, 29 Nov 2012 11:39:12 +0000 (12:39 +0100)]
Doc: Fix issues in Qt Designer docs

Fix the issues listed here:
http://community.kde.org/Qt5/Documentation/OverviewClassification

Change-Id: Ibdefbcc27d3ee47f06e0b0945be6d966734cb93e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDoc: Renaming Qt Assistant Manual's HTML page name.
Jerome Pasion [Wed, 28 Nov 2012 14:05:30 +0000 (15:05 +0100)]
Doc: Renaming Qt Assistant Manual's HTML page name.

-qtassistant-index.html conforms to the Qt 5 standard.

Change-Id: Ib8760790a389776bd9f37e5eab63adda1f3eb000
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoDoc: Modularize Qt Linguist docs
Leena Miettinen [Wed, 28 Nov 2012 16:12:47 +0000 (17:12 +0100)]
Doc: Modularize Qt Linguist docs

Move docs from qtdoc to qttools. Move examples and example docs
from qtbase to qttools. Fix references to snippets and examples.

Change-Id: Ib9f89bac416473dcfd8b4d06a05f8d07ff7c2fd0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agocentralize and fixup example sources install targets
Oswald Buddenhagen [Wed, 28 Nov 2012 15:06:45 +0000 (16:06 +0100)]
centralize and fixup example sources install targets

follow respective change in qtbase

Change-Id: I6e892deb9fa3868579e9c556fbcf00cc7bc6145c
Reviewed-by: hjk <qthjk@ovi.com>
5 years agomacdeployqt: Fix deployment of sql driver plugins
Eike Ziller [Wed, 28 Nov 2012 13:46:53 +0000 (14:46 +0100)]
macdeployqt: Fix deployment of sql driver plugins

Task-number: QTBUG-28248

Change-Id: I5e31770a3d31cb22b1ab17574ea38e509c59470d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoAssistant: rename doc/assistant.qdocconf to doc/qtassistant.qdocconf
hjk [Wed, 28 Nov 2012 10:26:36 +0000 (11:26 +0100)]
Assistant: rename doc/assistant.qdocconf to doc/qtassistant.qdocconf

Change-Id: Ica76bcfc664ff143a7621cc75d0fac19afb5aa74
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoUpdate information from Nokia to Digia and Qt Project
Sergio Ahumada [Tue, 27 Nov 2012 19:08:55 +0000 (20:08 +0100)]
Update information from Nokia to Digia and Qt Project

Task-number: QTBUG-28156
Change-Id: I2d813a0f4fa266af004714f04b16501f5751c881
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoAssistant: adjust to recently changed location of .qch files
hjk [Tue, 27 Nov 2012 15:14:30 +0000 (16:14 +0100)]
Assistant: adjust to recently changed location of .qch files

Change-Id: If0a395d332fbbba5cd5875e325db87d2087b09e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoDoc: Modularize Qt Designer Manual
Leena Miettinen [Tue, 27 Nov 2012 14:46:48 +0000 (15:46 +0100)]
Doc: Modularize Qt Designer Manual

Move the appropriate files from qtdoc to qttools and fix the links.
Create a qdocconf file and modify designer.pro.
Actual content fixes will be done in a separate commit.

Task-number: QTBUG-28025
Change-Id: Ibde5c0fe0b1ddbeb845d10a2a5ebf609491235b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoDoc: Changed qch namespace from "com" to "org"
Jerome Pasion [Fri, 23 Nov 2012 16:31:33 +0000 (17:31 +0100)]
Doc: Changed qch namespace from "com" to "org"

"org.qt-project" is what the Qt 5 modules use.

Change-Id: I86dc881672db7e9a56ba10c0a76c6485fe6e7c73
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoFix static build of Qt Designer on Windows.
Friedemann Kleint [Mon, 26 Nov 2012 14:04:27 +0000 (15:04 +0100)]
Fix static build of Qt Designer on Windows.

Ensure QT_DESIGNER_STATIC is defined everywhere such that
the EXPORT macros evaluate to empty.

Task-number: QTBUG-28131

Change-Id: I111b1351c4d81172adc9110d31b8b7ed13af7ef5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoFix inbuild help and message. Remove Trolltech references.
kh1 [Fri, 23 Nov 2012 16:26:13 +0000 (17:26 +0100)]
Fix inbuild help and message. Remove Trolltech references.

Change-Id: Ibe74e744d737c68854ca98dfe72af43287ff89c7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoFix build after QLocale enums update
Konstantin Ritt [Sat, 24 Nov 2012 04:07:12 +0000 (06:07 +0200)]
Fix build after QLocale enums update

Uncomment "Missing" languages that were added recently.
Use modern language names instead of compat ones.

Change-Id: I1f4669ed17e4c814607d93fdae16eff20485d98e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDo not compress QLayout-margin properties when writing UI files.
Friedemann Kleint [Fri, 23 Nov 2012 09:35:12 +0000 (10:35 +0100)]
Do not compress QLayout-margin properties when writing UI files.

QLayout::margin is deprecated.

[Do not cherry-pick to 4.8.]

Task-number: QTBUG-27552
Change-Id: I8d25e31d3be0ad336557cc306c3c68e681f9033d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoDetect QMainWindow-separator as passive interactor in Qt Designer.
Friedemann Kleint [Fri, 23 Nov 2012 09:04:00 +0000 (10:04 +0100)]
Detect QMainWindow-separator as passive interactor in Qt Designer.

Ensure that dock widgets in Qt Creator can be resized.

Task-number: QTCREATORBUG-8284
Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoBackport helpviewer_qwv.cpp fixes from QtCreator bugs 7199 and 8211.
Michael Brüning [Thu, 8 Nov 2012 14:55:21 +0000 (15:55 +0100)]
Backport helpviewer_qwv.cpp fixes from QtCreator bugs 7199 and 8211.

Corrected setup for HelpNetworkReply and changed uses of TextSizeMulti-
plier to use ZoomFactor.

Task-number: QTBUG-27899
modified:   src/assistant/assistant/helpviewer_qwv.cpp

Change-Id: I1d0a4052abb978dc26bd1c0b94a420faf8209fa4
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoDoc: Update Qt Assistant Manual to Qt 5
Leena Miettinen [Thu, 22 Nov 2012 12:56:51 +0000 (13:56 +0100)]
Doc: Update Qt Assistant Manual to Qt 5

Make the manual more task-oriented and
update all screenshots. Check functionality
and menu item names.

Task-number: QTBUG-28024
Change-Id: I79ba3740d072fb3a6a30533a578c0a6bfbb9a26c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoFix build of the arthurplugin example.
Friedemann Kleint [Thu, 22 Nov 2012 14:14:40 +0000 (15:14 +0100)]
Fix build of the arthurplugin example.

Task-number: QTBUG-28147
Change-Id: I296e3d4d50dffe78e0d70c2486ad6b7641149556
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQtAssistant: remove references to QApplication::Type
J-P Nurmi [Thu, 22 Nov 2012 13:17:17 +0000 (14:17 +0100)]
QtAssistant: remove references to QApplication::Type

Qt3 legacy QCoreApplication::Type and QApplication::type() will be
removed -> use qobject_cast instead.

Change-Id: I4a4af17ab6c8955af33779d1e5556610c443c93e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix linguist build after updating QLocale up to CLDR 22.1.
Friedemann Kleint [Thu, 22 Nov 2012 10:03:37 +0000 (11:03 +0100)]
Fix linguist build after updating QLocale up to CLDR 22.1.

Change-Id: Ie03060fe59db43fef83f055b7000240368fe9d46
qtbase: 3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoFix build of installed examples.
Friedemann Kleint [Wed, 21 Nov 2012 13:40:50 +0000 (14:40 +0100)]
Fix build of installed examples.

Task-number: QTBUG-27977

Change-Id: Ic64563d120087c57c3579c1268d73531d7022111
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDoc: Renamed documentation output to "qtassistant" directory.
Jerome Pasion [Wed, 21 Nov 2012 12:11:07 +0000 (13:11 +0100)]
Doc: Renamed documentation output to "qtassistant" directory.

-project name is qtassistant
-name should match index file for cross linking.

Change-Id: I2f098e3592453185c193a8fbbe97b01dbed50731
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoadd support for TR_EXCLUDE
Oswald Buddenhagen [Mon, 19 Nov 2012 11:13:28 +0000 (12:13 +0100)]
add support for TR_EXCLUDE

this is necessary for excluding 3rd party code, etc.

Change-Id: I2d32b6014741178bb8a62d29185241c90488754d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agodon't add DEPENDSPATH to VPATH
Oswald Buddenhagen [Mon, 19 Nov 2012 10:43:06 +0000 (11:43 +0100)]
don't add DEPENDSPATH to VPATH

follow suit with qmake ...

Change-Id: Ie1748d2056c7218b76d75cddd0bc7fb3f66cf8f7
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix syncqt-warnings.
Friedemann Kleint [Tue, 20 Nov 2012 14:43:09 +0000 (15:43 +0100)]
Fix syncqt-warnings.

Use include with module name in the public headers.

Change-Id: I29d285f54fbebf08e369a28bc1f3e40e3bfa1f75
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDesigner: squash warning about unused variables
hjk [Tue, 20 Nov 2012 11:09:37 +0000 (12:09 +0100)]
Designer: squash warning about unused variables

Change-Id: I8418aedd6bc121ae2b9605389beb3f6612d7fb85
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoAssistant: fix CONFIG value in .pro file
hjk [Tue, 20 Nov 2012 10:42:18 +0000 (11:42 +0100)]
Assistant: fix CONFIG value in .pro file

Move the deprecated 'help' value to QT, and remove the default 'qt'.

Change-Id: I78c987e8eed555c9c976732e216553d8002ee2b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:34:55 +0000 (10:34 +0100)]
Merge branch 'newdocs'

Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: If300627e2fef069274dec7785232ca144f3dfa28

5 years agoMake plugin deployment white-list based.
Morten Johan Sorvig [Wed, 24 Oct 2012 11:04:27 +0000 (13:04 +0200)]
Make plugin deployment white-list based.

Deploy specific plugins instead of deploying all
plugins with exceptions.

Before macdeployqt would deploy nearly all plugins.
The plugins themselves weren't necessarily a problem,
but this would also pull in all plugin dependencies,
massively bloating the app bundle.

Change-Id: Ia8d8b795101958da83b299e1d8922a01b5e8f13d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoAssistant: Updated documentation configuration for Qt 5
Jerome Pasion [Fri, 9 Nov 2012 16:49:40 +0000 (17:49 +0100)]
Assistant: Updated documentation configuration for Qt 5

-moved content from qt5/qtdoc, including snippets, images, example doc
-added QMAKE_DOCS to create a 'docs' target
-modularized doc into doc/src, doc/images, doc/snippets
-removed unneeded files

Change-Id: I0f3774d51617c57a731aa54d7503e3d42a265747
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
5 years agore-bootstrap lrelease
Oswald Buddenhagen [Mon, 29 Oct 2012 19:55:24 +0000 (20:55 +0100)]
re-bootstrap lrelease

this is needed for being able to x-compile translations.

Change-Id: Ia2a00e8195f84feaedd036e6b7b83df373425b38
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agofix bootstrapped build
Oswald Buddenhagen [Wed, 31 Oct 2012 10:12:58 +0000 (11:12 +0100)]
fix bootstrapped build

Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoadjust fake QCoreApplication::translate() to qtcore changes
Oswald Buddenhagen [Mon, 29 Oct 2012 20:12:11 +0000 (21:12 +0100)]
adjust fake QCoreApplication::translate() to qtcore changes

Change-Id: I52a74c7ad499312b35b3a25c6ad6d571e0dedb61
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove stale QT_NO_TRANSLATION ifdefs
Oswald Buddenhagen [Mon, 29 Oct 2012 20:09:30 +0000 (21:09 +0100)]
remove stale QT_NO_TRANSLATION ifdefs

they are from the times when these files were part of the qt api

Change-Id: Ic4b0d6af68e4cbba14e7efe0ca0bb901641e021b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agofix non-qmake build of the evaluator v5.0.0-beta2
Oswald Buddenhagen [Fri, 2 Nov 2012 18:46:19 +0000 (19:46 +0100)]
fix non-qmake build of the evaluator

Change-Id: I024031a03e44151b0b350dea83bd5bae1740568f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agorewrite default spec handling
Oswald Buddenhagen [Mon, 29 Oct 2012 11:43:43 +0000 (12:43 +0100)]
rewrite default spec handling

instead of symlinking (on unix) or creating a forwarding spec (on
windows), just put the default specs into (the bootstrapped)
QLibraryInfo.

Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/7d20f3dd1065a20b40cb4689783fba05190fe317)

5 years agoFix qmake's pro file cache to interact correctly with write_file
Simon Hausmann [Thu, 25 Oct 2012 08:55:00 +0000 (10:55 +0200)]
Fix qmake's pro file cache to interact correctly with write_file

When writing a file with write_file() we have to inform the pro file parser
cache to discard the file if it's existant in the cache, to ensure that
calling include() after write_file() always works.

Change-Id: I7d09269a57de55ca30b0e11dd40770de9f919f64
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f45d6414ad6ef1d75f049a61411cd954bcae29c3)
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoUse QStringList::join(QChar) overload where applicable [qmake]
Marc Mutz [Fri, 18 May 2012 18:00:23 +0000 (20:00 +0200)]
Use QStringList::join(QChar) overload where applicable [qmake]

This is an automated change performing the following replacements:
                    join\("(.)"\) -> join('\1')
  join\(QLatin1String\("(.)"\)\)  -> join(QLatin1Char('\1'))
  join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))

Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f4d47945ba17db276e94046473816014ed0342e9)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoqmake: add ProStringList::join(QChar)
Marc Mutz [Wed, 19 Sep 2012 15:50:42 +0000 (17:50 +0200)]
qmake: add ProStringList::join(QChar)

Same reasoning as for 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies.

Adding the overload was easier than to teach a Perl script to distinguish
between QStringList and ProStringList instances...

Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/cbf447069cfeb799ff5e09902be065d77f2e7707)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoresolve only one level of symlinks, and only for the default specs
Oswald Buddenhagen [Tue, 18 Sep 2012 07:32:46 +0000 (09:32 +0200)]
resolve only one level of symlinks, and only for the default specs

otherwise we end up in the source tree, which is counterproductive.

Task-number: QTBUG-26869
Change-Id: Id44a94f827dc285c75b9b243c8ef6478e668e3ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/04cd23428a4f2cfa5ee02b70f2086ff832aae925)

5 years agofold m_qmakespecFull back into m_qmakespec
Oswald Buddenhagen [Tue, 18 Sep 2012 08:54:52 +0000 (10:54 +0200)]
fold m_qmakespecFull back into m_qmakespec

the original value is not used any more after the final resolution.

Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/cc2cd0db5d0c53605ab93f796765667ead1920e8)

5 years agofetch all properties from qmake
Oswald Buddenhagen [Wed, 31 Oct 2012 10:13:44 +0000 (11:13 +0100)]
fetch all properties from qmake

don't filter out ^QMAKE_.*:
- QMAKE_MKSPECS is not printed any more, so needs no filtering
- QMAKE_VERSION can be simply used now, as we are now rather close to the
  real qmake
- QMAKE_SPEC and QMAKE_XSPEC need to be fetched
  - this fixes the default spec resolution

Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>