qt:anselmolsm-qttools.git
5 years agoFix designer build with QT_NO_CLIPBOARD.
Janne Anttila [Tue, 19 Jun 2012 05:50:10 +0000 (08:50 +0300)]
Fix designer build with QT_NO_CLIPBOARD.

The required variable was inside incorrect scope.

Change-Id: I4e6c7378ab3a2f44143640de67d7765eeb4d7030
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoFix building of qttools when printsupport module is disabled.
Janne Anttila [Tue, 19 Jun 2012 05:45:55 +0000 (08:45 +0300)]
Fix building of qttools when printsupport module is disabled.

The source code already has necessary #ifdefs in place, but dependency
to printsupport library wasn't conditional in *.pro files. Made
printsupport conditional also in *.pro files.

Change-Id: I0bcc4765d5f848dc5334fd380671989a9cc27f74
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoclucene: Compile with clang's libc++
Bradley T. Hughes [Wed, 30 May 2012 09:41:06 +0000 (11:41 +0200)]
clucene: Compile with clang's libc++

When using clang's libc++, the 'using namespace std;' in CLucene's
StdHeader.h causes ambiguity between wcschr() from wchar.h and
std::wcschr() from cwchar (which is automatically included by libc++).

The only symbols used from the std namespace are std::min() and
std::max() so only pull these in, not the whole std namespace.

Change-Id: I5700f6a221ee0667d4a3bb85110f6fea17a121bf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix windows build due to min/max macro clash
Simon Hausmann [Wed, 13 Jun 2012 11:38:13 +0000 (13:38 +0200)]
Fix windows build due to min/max macro clash

qdatetime.h uses std::min/max and windows system headers like to redefine
min/max. Include qt_windows.h instead of windows.h to include a workaround
for this conflict.

Change-Id: I756ebfcae2ba5540240fe7e8c7b1ad71e2a99cec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUse new signature for message handler
Kai Koehne [Wed, 6 Jun 2012 17:58:55 +0000 (19:58 +0200)]
Use new signature for message handler

The const char * argument got replaced by a QString one.

Change-Id: I7211669154b1f2108cd69efc7dc00cd159f7741b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoRemove QtScript and QtQuick1 dependency
Lars Knoll [Sat, 2 Jun 2012 12:22:50 +0000 (14:22 +0200)]
Remove QtScript and QtQuick1 dependency

Change-Id: Ifdfef9222c99b2b71ddb6c579decd1aa09637841
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoThis plugin has moved to qtquick1
Lars Knoll [Sat, 2 Jun 2012 12:13:13 +0000 (14:13 +0200)]
This plugin has moved to qtquick1

This somewhat untangles module dependencies, and removes
the qtquick1 dependency from qttools. It also leads to
compiling the designer plugin for a module together
with the module.

Change-Id: I8f18b1374ffb74a7753714b3162a67369b535c4d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoRemove obsolete BIC data
Lars Knoll [Sat, 2 Jun 2012 08:21:05 +0000 (10:21 +0200)]
Remove obsolete BIC data

Change-Id: Ib8b447377227117a520ec1f896637cb5235de850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agodo not delete a literal constant
Tim Jenssen [Wed, 6 Jun 2012 14:40:51 +0000 (16:40 +0200)]
do not delete a literal constant

Change-Id: I7bbee0d4314f2dcbc5a170c6c86ceb3c8acd3f42
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoFix static init issue on MSVC2010 with HelpEngineWrapper.
Casper van Donderen [Wed, 6 Jun 2012 12:05:09 +0000 (14:05 +0200)]
Fix static init issue on MSVC2010 with HelpEngineWrapper.

Change-Id: I4ffcde027d075f5556031bc40e3635202dd10726
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
5 years agoRemove the remaining traces of the old plugin system
Lars Knoll [Sun, 27 May 2012 14:54:31 +0000 (16:54 +0200)]
Remove the remaining traces of the old plugin system

Change-Id: Id00d34a937703c9043c2831349f6a7b15e4da724
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agofix path to module pri file
Oswald Buddenhagen [Tue, 29 May 2012 12:57:57 +0000 (14:57 +0200)]
fix path to module pri file

Change-Id: Iee4964add76a10027643599bce8f846b1b6d249b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFixed CeTest remotelib build for WinCE 5.
Janne Anttila [Mon, 12 Dec 2011 12:14:15 +0000 (14:14 +0200)]
Fixed CeTest remotelib build for WinCE 5.

WinCE 5 does not have PPN_POWERBUTTONPRESSED but PPN_SUSPENDKEYPRESSED.
Newer WinCE version have both, but PPN_POWERBUTTONPRESSED is defined
to same as PPN_SUSPENKEYPRESSED, that's why it is safe to use
PPN_SUSPENKEYPRESSED in all WinCE versions.

Change-Id: Ida0604f86330c3e833a1ad41a88db55aa6a625fa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
(cherry picked from commit 15f84271e8eb47a035ad572fb3db81171f354839)
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
5 years agoPrefer QMetaType over QVariant during a type information query.
Jędrzej Nowacki [Mon, 21 May 2012 16:20:45 +0000 (18:20 +0200)]
Prefer QMetaType over QVariant during a type information query.

As a side effect the patch probably fix special case, when an interface
wants a variant and one of the parameters has to be converted. Before
QVariant::nameToType was returning only builtin types ids.

Change-Id: I473a9bcbd9249acf7c232492fa62c53de3ff5c71
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQt Designer: Update copied rcc-code to contain the correct hash function.
Friedemann Kleint [Mon, 21 May 2012 14:47:23 +0000 (16:47 +0200)]
Qt Designer: Update copied rcc-code to contain the correct hash function.

This fixes icons not showing in the resource editor or style sheets.

See qtbase:ddb70bee2fd323ddc4273aec5d40d975f50d2904

Change-Id: I7c21dd738c1b75fbe071685dfb89f43a79c49ff9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoQtTools: Fix usage of deprecated QCoreApplication::translate.
Friedemann Kleint [Mon, 21 May 2012 10:07:50 +0000 (12:07 +0200)]
QtTools: Fix usage of deprecated QCoreApplication::translate.

Change-Id: I7208cfd337c779f9f274315cf87dbc8853afcbaf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoUpdate the includes after QIcon was moved to back to QtGui
Olivier Goffart [Wed, 16 May 2012 16:14:18 +0000 (18:14 +0200)]
Update the includes after QIcon was moved to back to QtGui

Change-Id: I103c7c48f2280b22a8b224a82a07c29ffbae3c77
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agosync.profile: remove dependency on qtsvg.
Toby Tomkins [Mon, 14 May 2012 05:12:09 +0000 (15:12 +1000)]
sync.profile: remove dependency on qtsvg.

sync.profile should not reference modules as dependancies unless they
are actually required; update sync.profile accordingly.

Change-Id: Ic01bf4412cb3407b82311873da3e7a32d1e1846f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix warning with GCC
Olivier Goffart [Fri, 11 May 2012 08:34:03 +0000 (10:34 +0200)]
Fix warning with GCC

warning: converting ‘false’ to pointer type ‘QWidget*’

Change-Id: I4cd605e1639f0f59033fbd7152ec645ce1252f38
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoBuild fix.
Jędrzej Nowacki [Fri, 11 May 2012 07:28:22 +0000 (09:28 +0200)]
Build fix.

QVariant doesn't have QKeySequence constructor in Qt5 (effect of
the modularization project), therefore it can not be default
constructed.

Change-Id: Ia78b060d2e9c8fae8d60a3a17de75a390746749d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoDoc: Fix \sa usage
Marius Storm-Olsen [Thu, 10 May 2012 12:01:18 +0000 (14:01 +0200)]
Doc: Fix \sa usage

Ensure comma between elements (1 missing), single space and curly-
braces around title elements, etc.

Change-Id: I684a095fdafed33eeab9fa3d37ace2453b0673b2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoFix deprecated item view methods in Qt Designer.
Friedemann Kleint [Tue, 8 May 2012 10:59:21 +0000 (12:59 +0200)]
Fix deprecated item view methods in Qt Designer.

Change-Id: Ie78ca6c9b5fc2d2820f8ebdbe453ac715aa88cb8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1 [Linguist]
Thiago Macieira [Thu, 3 May 2012 13:45:41 +0000 (15:45 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1 [Linguist]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ibb3c04114e1a311ff70ef649d977524a6dfec0aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoAdd a .gitignore to Assistant
Thiago Macieira [Thu, 3 May 2012 13:42:33 +0000 (15:42 +0200)]
Add a .gitignore to Assistant

These files are generated in the source dir, unfortunately.

Change-Id: Ib3d64ee817a5217a04a9a39005201df0ac23691c
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1 [Assistant]
Thiago Macieira [Thu, 3 May 2012 13:41:25 +0000 (15:41 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1 [Assistant]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I8bcc6bbe2fcd49b31a4850029b2830b1f8cb0353
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoAdd a .gitignore to Designer
Thiago Macieira [Thu, 3 May 2012 13:42:33 +0000 (15:42 +0200)]
Add a .gitignore to Designer

These files are generated in the source dir, unfortunately.

Change-Id: I00900fdde02e51054c2de082c44ae94b75954575
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1 [other tools]
Thiago Macieira [Thu, 3 May 2012 13:46:22 +0000 (15:46 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1 [other tools]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I1e82285ad996cb2796807260383d1d056b930d0e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1 [Designer]
Thiago Macieira [Thu, 3 May 2012 13:43:50 +0000 (15:43 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1 [Designer]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ifb4b164024dd1e75b2f24962e6d5d1816dca5916
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoDon't use the QRegExp methods that modify the object [Linguist]
Thiago Macieira [Mon, 23 Apr 2012 15:47:03 +0000 (17:47 +0200)]
Don't use the QRegExp methods that modify the object [Linguist]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: I181d37fd98b00550dd98d418a33183a4bde0c532
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoAdd bug number for unstable test.
Jason McDonald [Tue, 24 Apr 2012 09:58:53 +0000 (19:58 +1000)]
Add bug number for unstable test.

Task-number: QTBUG-25483
Change-Id: Ic2778a5b23950a698eb678938a38afe7317421d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoMake sure -fPIE is added to the compile flags.
Stephen Kelly [Fri, 20 Apr 2012 09:51:14 +0000 (11:51 +0200)]
Make sure -fPIE is added to the compile flags.

Change-Id: Iedf3f0ff3dbb23753ecb1e0ecbd9b03b3b56a87c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix Assistant crash when closing last tab.
Janne Anttila [Mon, 16 Apr 2012 08:25:10 +0000 (11:25 +0300)]
Fix Assistant crash when closing last tab.

Disable 'Close Tab' action from 'File' menu  for last tab to avoid
crash. Context menu 'close' actions in "open pages" widget, are already
disabled under same conditions.

Task-number: QTBUG-23986
Change-Id: I7f285f4511c40a7e822372355cad4eadf3922306
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoDon't use the QRegExp methods that modify the object [Designer]
Thiago Macieira [Mon, 23 Apr 2012 15:46:55 +0000 (17:46 +0200)]
Don't use the QRegExp methods that modify the object [Designer]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: I58984ddce6a44cca7fe5a7b36e4595bad791d976
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoModify qtdeclarative javascript namespace to fix compilation failure.
Toby Tomkins [Tue, 24 Apr 2012 01:49:36 +0000 (11:49 +1000)]
Modify qtdeclarative javascript namespace to fix compilation failure.

Change-Id: I7e49dbd6cab5ca2e715e327dab41969b1e18236c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoDon't use the QRegExp methods that modify the object [Assistant]
Thiago Macieira [Mon, 23 Apr 2012 15:46:29 +0000 (17:46 +0200)]
Don't use the QRegExp methods that modify the object [Assistant]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: I63bdca450db06adf1935672ca678b779cd89f961
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoMove away from deprecated API
Olivier Goffart [Fri, 20 Apr 2012 17:28:00 +0000 (19:28 +0200)]
Move away from deprecated API

Change-Id: I86bd8dcfb044c0dd9db1641f21e134e1008f5ec4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFixed window raise issue when handling remote commands
Taito Silvola [Fri, 20 Apr 2012 07:49:38 +0000 (10:49 +0300)]
Fixed window raise issue when handling remote commands

Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to
raise and activate main help window after processing the remote command.

Task-number: QTBUG-25407
Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoFix assistant build with QT_NO_CLIPBOARD
Andreas Holzammer [Fri, 20 Apr 2012 08:06:45 +0000 (10:06 +0200)]
Fix assistant build with QT_NO_CLIPBOARD

Change-Id: I2c31525cba5b613ad13368fe11869789e003cbd1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoFix build of designer components with QT_NO_CLIPBOARD
Andreas Holzammer [Fri, 20 Apr 2012 08:21:10 +0000 (10:21 +0200)]
Fix build of designer components with QT_NO_CLIPBOARD

Change-Id: I8bfcb5baed75a481c279e6114ae95b62dc252dc4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoFix building designer shared with QT_NO_CLIPBOARD
Andreas Holzammer [Fri, 20 Apr 2012 08:26:14 +0000 (10:26 +0200)]
Fix building designer shared with QT_NO_CLIPBOARD

Change-Id: I25194a08f2b840276ec253d63f32cb39e3c69827
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoCompile linguist with QT_NO_CLIPBOARD defined
Andreas Holzammer [Fri, 20 Apr 2012 08:32:35 +0000 (10:32 +0200)]
Compile linguist with QT_NO_CLIPBOARD defined

Change-Id: Iacbbf725d88f83720d0b7100e256912e0730a478
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoFix Build
Andreas Holzammer [Fri, 20 Apr 2012 08:03:25 +0000 (10:03 +0200)]
Fix Build

isspace is in std namespace.

Change-Id: Idc5f09c5c60df874fac9c91bb3a3538f4bea0998
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoCompile fix if QT_NO_CLIPBOARD defined
Andreas Holzammer [Thu, 19 Apr 2012 18:18:21 +0000 (20:18 +0200)]
Compile fix if QT_NO_CLIPBOARD defined

Change-Id: I3a4126c370b09c56c2e869254962035ae36c7c75
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoRemove the dbus build-tools, CMake config files and tests.
Stephen Kelly [Wed, 14 Mar 2012 16:23:53 +0000 (17:23 +0100)]
Remove the dbus build-tools, CMake config files and tests.

They have been moved to qtbase.

Change-Id: Id3707032bc399e2ee915581789e17a58b9413166
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoQtTools: Fix compilation after merge of the api_changes branch.
Friedemann Kleint [Wed, 18 Apr 2012 11:10:42 +0000 (13:10 +0200)]
QtTools: Fix compilation after merge of the api_changes branch.

Remove Qt::LogText, fix phonon plugin.

Change-Id: If51bab691d14d7caae102b60196b2d8c5b07da70
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
5 years agoAdapt to Qt5 meta-object changes
Kent Hansen [Thu, 1 Mar 2012 10:38:11 +0000 (11:38 +0100)]
Adapt to Qt5 meta-object changes

QMetamethod::signature() is now called methodSignature(), and it
returns a QByteArray.

The new function QMetaMethod::isValid() should be used to check
whether a method is valid, rather than relying on signature() to
return a 0 pointer as before.

Change-Id: Ifc163497293213177ef80a4ea8e4e5577513f52a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFixed cetest build for Windows CE.
Janne Anttila [Mon, 12 Sep 2011 12:03:22 +0000 (15:03 +0300)]
Fixed cetest build for Windows CE.

The bootstrap configuration for cetest was missing a few dependencies
which broke the build. Added the missing dependencies to cetest
bootstrapped.pri.

Task-number: QTBUG-22505
Change-Id: Ibf966f9855f7eb8a7e561ea570c17ff447aa057d
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 4a6e91d912de6039230ec6f02b0bc5f3507f06cc)

5 years agoMerge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/master
Lars Knoll [Thu, 12 Apr 2012 10:05:58 +0000 (12:05 +0200)]
Merge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/master

5 years agoDesigner/Windows: Add close button to QWidget-type previews.
Friedemann Kleint [Thu, 12 Apr 2012 09:29:11 +0000 (11:29 +0200)]
Designer/Windows: Add close button to QWidget-type previews.

Change-Id: I6063e921c0ccc3588fb6268be39c45a7479e991c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoMerge commit 'qt-v5.0.0-alpha1'
Marius Storm-Olsen [Wed, 11 Apr 2012 17:56:11 +0000 (12:56 -0500)]
Merge commit 'qt-v5.0.0-alpha1'

Change-Id: I5af4b98754ede311bfd4b2f9c77d76096447ea62

5 years agoDesigner: Use QWidget::grab() instead of QPixmap::grabWidget().
Friedemann Kleint [Thu, 5 Apr 2012 08:33:44 +0000 (10:33 +0200)]
Designer: Use QWidget::grab() instead of QPixmap::grabWidget().

Suppress deprecation warnings.

Change-Id: If254bab3683f21f8eb85f1f2a2c881d285c093ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix building of the Arthur plugin.
Friedemann Kleint [Wed, 4 Apr 2012 12:08:45 +0000 (14:08 +0200)]
Fix building of the Arthur plugin.

Do not build by default as it requires a library located in the
qtbase painting examples.

Change-Id: I19ac8ad31f9b2e194f88c5c3b168a2352dd72f1e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoremove references to $$QT_SOURCE_TREE
Oswald Buddenhagen [Tue, 3 Apr 2012 19:43:55 +0000 (21:43 +0200)]
remove references to $$QT_SOURCE_TREE

Change-Id: I65b43ced4c165c9f41c107b9eefe7d9e72127b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoremove qtxml includes from public header
Oswald Buddenhagen [Mon, 2 Apr 2012 12:39:57 +0000 (14:39 +0200)]
remove qtxml includes from public header

it's not part of the api (any more)

Change-Id: I14da9f1e8a8cce9d2942ddb7a94997c26bbadfd0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoRemove Qt Designer's dependency on rcc code from qtbase. qt-v5.0.0-alpha1
Friedemann Kleint [Wed, 28 Mar 2012 13:52:14 +0000 (15:52 +0200)]
Remove Qt Designer's dependency on rcc code from qtbase.

Copy the files over.

Change-Id: Iffe7e79a398c968901bf7f12e38af798bf4ca23d

5 years agoRemove Qt Designer's dependency on rcc code from qtbase.
Friedemann Kleint [Wed, 28 Mar 2012 13:52:14 +0000 (15:52 +0200)]
Remove Qt Designer's dependency on rcc code from qtbase.

Copy the files over.

Change-Id: Iffe7e79a398c968901bf7f12e38af798bf4ca23d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
5 years agoUse "qt-project.org" instead of "trolltech" in the resource system
hjk [Mon, 26 Mar 2012 07:29:47 +0000 (09:29 +0200)]
Use "qt-project.org" instead of "trolltech" in the resource system

Task-number: QTBUG-23272
Change-Id: I383e66291fc2c5bb431792c1b93a152a9b02462e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoRemove use of Q_GLOBAL_STATIC_WITH_INITIALIZER
Thiago Macieira [Thu, 20 Oct 2011 09:19:17 +0000 (11:19 +0200)]
Remove use of Q_GLOBAL_STATIC_WITH_INITIALIZER

This macro was evil. It's gone now.

Change-Id: Ib33b23e4055de7361b8527009e4bc007d077a39d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix warnings about deprecated QtDeclarative headers in lupdate.
Friedemann Kleint [Thu, 22 Mar 2012 11:10:40 +0000 (12:10 +0100)]
Fix warnings about deprecated QtDeclarative headers in lupdate.

Change-Id: I9d15f16766da49488a170de93e3630b47e2e640f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoBuild fix for -force-asserts configure option
Yuchen Deng [Wed, 21 Mar 2012 09:15:21 +0000 (17:15 +0800)]
Build fix for -force-asserts configure option

Change-Id: I6fbbc90c7af0abdac6225a33650460bc64eda163
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix DESTDIR of Qt Assistant.
Friedemann Kleint [Thu, 15 Mar 2012 15:19:41 +0000 (16:19 +0100)]
Fix DESTDIR of Qt Assistant.

Add missing DESTDIR for assistant.exe and Use QT.help.bins for all
assistant-related binaries.

Change-Id: I9ea4f1fbd5d5de11af2449afb66fd15c4144eac9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoRemove xml dependency from the dbus tools.
Stephen Kelly [Tue, 6 Mar 2012 15:58:49 +0000 (16:58 +0100)]
Remove xml dependency from the dbus tools.

They do not actually require it.

Change-Id: Ib80c08ccb10a19e4e3694b65e95f2e585999fe01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoGenerate the correct paths for libs and bins in the cmake files.
Stephen Kelly [Mon, 5 Mar 2012 22:45:25 +0000 (23:45 +0100)]
Generate the correct paths for libs and bins in the cmake files.

Change-Id: I33f5de28c4adad8b9822f74675d53fd6f63ef527
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoCompile fix (lupdate).
Friedemann Kleint [Tue, 6 Mar 2012 11:13:27 +0000 (12:13 +0100)]
Compile fix (lupdate).

- Adapt lupdate to removal of QCoreApplication::CodecForTr.

Change-Id: Id26c49f024966d93a9845ecb69a3be46d46b5f21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 18:21:38 +0000 (19:21 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I374dfb657db98235d622ec865c52364a5291ae0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
5 years agoRemove AccessibilityPrepare.
Frederik Gladhorn [Mon, 13 Feb 2012 14:24:42 +0000 (15:24 +0100)]
Remove AccessibilityPrepare.

This enum value was never implemented in Qt in any meaningful way.
It will be removed from qtbase.

Change-Id: I29a89eeed5d232a1f4d2c835fd9fedb5d7e6fe97
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
5 years agoFix for Qt with specified bindir.
Stephen Kelly [Mon, 27 Feb 2012 17:13:10 +0000 (18:13 +0100)]
Fix for Qt with specified bindir.

Change-Id: Ie4492269e8a7cd35959584bf09c02d4af5303917
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoMake the tests somewhat more standard.
Stephen Kelly [Mon, 27 Feb 2012 17:18:08 +0000 (18:18 +0100)]
Make the tests somewhat more standard.

Change-Id: I1b010a23763cb0de404f8d89a385f4d389f2c6af
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoPort the tests in qttools to ctest.
Stephen Kelly [Mon, 27 Feb 2012 17:16:23 +0000 (18:16 +0100)]
Port the tests in qttools to ctest.

Change-Id: I30bcbe2e38d47a390906c01efee5025bb868ca04
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoPort to the @lst-file support in lupdate.
Stephen Kelly [Fri, 24 Feb 2012 15:54:51 +0000 (16:54 +0100)]
Port to the @lst-file support in lupdate.

Change-Id: Iac9e528e0da526a5a879a914e3e22cfb50e60cdc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoAssistant: Remove usage of deprecated QAbstractItemModel::reset
Olivier Goffart [Sun, 26 Feb 2012 11:08:26 +0000 (12:08 +0100)]
Assistant: Remove usage of deprecated QAbstractItemModel::reset

Change-Id: Ibca4d3ece78e87a1a4f9065f446d9f14a1459c03
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoDesigner: remove usage of deprecated API
Olivier Goffart [Sun, 26 Feb 2012 11:09:44 +0000 (12:09 +0100)]
Designer: remove usage of deprecated API

Change-Id: I6ca4d3ece78e87123e57865f446d9f14a1459c0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoclean up qmake-generated projects
Oswald Buddenhagen [Tue, 21 Feb 2012 15:35:25 +0000 (16:35 +0100)]
clean up qmake-generated projects

remove "header" and assignmets which are defaults or bogus

Change-Id: I300d4be1928e5a7dab0fdf1c5a56992e9960b1a4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
5 years agoAdding condition for activeqt plugins to only build on win32.
Toby Tomkins [Tue, 21 Feb 2012 07:19:27 +0000 (17:19 +1000)]
Adding condition for activeqt plugins to only build on win32.

Including activeqt only makes sense on win32 platforms, hence only
compile them on these. Because QT_CONFIG will contain activeqt even
when the module is not compiled, this needs to be explicitly set.

Change-Id: I3bd66f85b3ccbd138dac22ed4e3fbd5c907f013a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix compilation of View3d plugin.
Friedemann Kleint [Mon, 20 Feb 2012 11:40:48 +0000 (12:40 +0100)]
Fix compilation of View3d plugin.

Change-Id: Ifb6c14b927d26f7ab5bb87d218d4be3f65e9bafc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoDesigner: Build ActiveQt custom widget plugin.
Friedemann Kleint [Mon, 20 Feb 2012 11:39:48 +0000 (12:39 +0100)]
Designer: Build ActiveQt custom widget plugin.

Adapt profile and activate it in plugins.pro.

Change-Id: I98378d894443521dc1d3d467338391eb53ebef2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoUse new plugin system in Qt Designer.
Friedemann Kleint [Fri, 17 Feb 2012 09:24:29 +0000 (10:24 +0100)]
Use new plugin system in Qt Designer.

- Change interface names to use the prefix "org.qt-project.Qt."
- Add json files and use new macros.

Change-Id: I2b0e6ac59b6dfbdced70751921a588f6e417615f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoRemove duplicated plugin macro to fix compilation.
Toby Tomkins [Thu, 16 Feb 2012 03:24:15 +0000 (13:24 +1000)]
Remove duplicated plugin macro to fix compilation.

Change-Id: Ie6098bc2b5e54ee1d1bef1eace05f5afe71d3c70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFixed dependencies in sync.profile
Rohan McGovern [Wed, 15 Feb 2012 02:54:07 +0000 (12:54 +1000)]
Fixed dependencies in sync.profile

Remove duplicate entry for qtscript.

Add missing qtquick1.

Change-Id: Icb81f895fbb5c0f424fed4e988a0307b90562bab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
5 years agoQt Designer: Fix compilation.
Friedemann Kleint [Tue, 7 Feb 2012 09:39:59 +0000 (10:39 +0100)]
Qt Designer: Fix compilation.

- Change module name of QDeclarativeView to quick1,
  remove declarative.

Change-Id: I706832407151b03b26a3a34e00cee11e324a3439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix parsing error in CMake macro.
Stephen Kelly [Thu, 2 Feb 2012 15:16:59 +0000 (16:16 +0100)]
Fix parsing error in CMake macro.

One extra )

Change-Id: I47b64a06112a54a4199fd3fb23ded74d89bbcdef
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>
5 years agoAdd the possibility to patch additional executables.
Eike Ziller [Wed, 14 Sep 2011 12:14:34 +0000 (14:14 +0200)]
Add the possibility to patch additional executables.

Change-Id: I47ecf04f538e094fe67110e627a5f17a34438df9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
5 years agoDesigner: Fix compilation.
Friedemann Kleint [Wed, 1 Feb 2012 08:24:03 +0000 (09:24 +0100)]
Designer: Fix compilation.

- QFileDialog::selectedFilter()->QFileDialog::selectedNameFilter()
- Message handler refactoring

Change-Id: Ie80ff0948ac6a6dd5cf0d785b81720d982e1f4fa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
5 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 05:22:34 +0000 (15:22 +1000)]
Remove "All rights reserved" line from license headers.

As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove dependency on designer from linguist and headers autotest.
Toby Tomkins [Tue, 24 Jan 2012 05:08:33 +0000 (15:08 +1000)]
Remove dependency on designer from linguist and headers autotest.

When compiling with shadow build option the Qt sources are not
available. The QtDesigner library requires direct access to these
sources to compile. Hence if we remove the dependency on designer
(which is not required) we can compile successfully with the
shadow build configure option.

Change-Id: I36fa408a32a354d54a9b47aed8a7cba447cf4129
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 05:23:30 +0000 (15:23 +1000)]
Update obsolete contact address.

Replace Nokia contact email address with Qt Project website.

Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoQt Designer: Add translation-attributes to string list properties.
Friedemann Kleint [Thu, 12 Jan 2012 11:10:47 +0000 (12:10 +0100)]
Qt Designer: Add translation-attributes to string list properties.

- Add translation parameters to XML schema for ui.
- Introduce PropertySheetStringListValue to property sheet,
  load & save code, add to property sheet and property editor.

Task-number: QTBUG-8926
Task-number: QTBUG-20440

Change-Id: Ib5e9e2e9ba603bb68984a102e3c3fc8ff1cb4df0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
5 years agolupdate: Handle translation-attributes of string list properties.
Friedemann Kleint [Thu, 19 Jan 2012 08:31:11 +0000 (09:31 +0100)]
lupdate: Handle translation-attributes of string list properties.

Stringlists now have translation attributes that apply to all
items.

Initial-patch-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I230f3907631074df394238e30b3ed7a15adcca4b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
5 years agoFixed compile.
Rohan McGovern [Fri, 20 Jan 2012 01:13:05 +0000 (11:13 +1000)]
Fixed compile.

QDir::convertSeparators -> QDir::toNativeSeparators

convertSeparators was deprecated since Qt 4.2 (!) and recently was
removed from Qt 5.

Change-Id: I6a7dad582ed4270cfbd09defc94c73103bb2a9fe
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
5 years agoRemove the use of QT_MODULE()
Gunnar Sletta [Mon, 9 Jan 2012 08:31:36 +0000 (09:31 +0100)]
Remove the use of QT_MODULE()

Change-Id: I8b9f3c04b0089047c6583f986a2fb903cf7bf62d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoCompile fix for accessibility.
Friedemann Kleint [Fri, 13 Jan 2012 08:18:19 +0000 (09:18 +0100)]
Compile fix for accessibility.

Change-Id: Ib2e668441da3fa5ab176a2dea6b5b8f22dbfec5b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoQt Designer: Simplify property editor for translatable properties.
Friedemann Kleint [Wed, 11 Jan 2012 11:11:59 +0000 (12:11 +0100)]
Qt Designer: Simplify property editor for translatable properties.

- Introduce sub-propertymanager for translatable properties
  inheriting PropertySheetTranslatableData.
- Use common enumeration values for sub-propertymanager functions
  to make it easier to chain them.

Task-number: QTBUG-8926
Task-number: QTBUG-20440

Change-Id: I8e99aa01fdca7e474a0ec83b7209a28a2a689bf9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoUpdate copyright year in Nokia copyright headers.
Jason McDonald [Tue, 10 Jan 2012 06:23:26 +0000 (16:23 +1000)]
Update copyright year in Nokia copyright headers.

Update copyright headers from before 2011

Change-Id: I7d822c71326283db79fa392022baa09a3c22b331
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agosync.profile: introduce dependency on qtjsbackend
Rohan McGovern [Tue, 10 Jan 2012 08:04:41 +0000 (18:04 +1000)]
sync.profile: introduce dependency on qtjsbackend

sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.

Change-Id: Ia6ccda2cfb971b2cd58bd9e2d880c76a5603ad37
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
5 years agoReplace Q_TYPENAME by typename
Olivier Goffart [Wed, 2 Nov 2011 18:38:10 +0000 (19:38 +0100)]
Replace Q_TYPENAME by typename

Q_TYPENAME is being removed.

Change-Id: I4b4b34dbf87e3f2f3a604d4370d1c0e55e1553c5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoPort assistant to QNetworkAccessManager
Friedemann Kleint [Mon, 9 Jan 2012 10:22:33 +0000 (11:22 +0100)]
Port assistant to QNetworkAccessManager

Change-Id: Idd3f5ebbb6719861ee20d9cef2fc5d98c24360f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoQt Designer: Simplify code for translatable properties.
Friedemann Kleint [Fri, 6 Jan 2012 15:37:12 +0000 (16:37 +0100)]
Qt Designer: Simplify code for translatable properties.

Introduce base class for PropertySheetStringValue,
PropertySheetKeySequenceValue, which allows for removing
redundant code to set/retrieve the translation parameters
to/from the DOM classes.

Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I5b65fff2bb27be82d04f96cf0d66652887b1c4b7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 06:10:00 +0000 (16:10 +1000)]
Update copyright year in license headers.

Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94
Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoConvert macros to functions.
Stephen Kelly [Mon, 19 Dec 2011 21:51:50 +0000 (22:51 +0100)]
Convert macros to functions.

Change-Id: I08104d1189ed7d7debcb9f5bd38e8862423ef2c3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoAvoid using Trolltech logo in documentation.
Jason McDonald [Tue, 20 Dec 2011 04:32:08 +0000 (14:32 +1000)]
Avoid using Trolltech logo in documentation.

Change-Id: Iafc6ec21069994599506562edfcd1c98a850c5f7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>