Oswald Buddenhagen [Tue, 7 Aug 2012 17:13:03 +0000 (19:13 +0200)]
follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I20e609469de3cd050fd2ef0dceeefbf424249b44
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Mon, 13 Aug 2012 08:53:49 +0000 (10:53 +0200)]
remove manual linking of libQtClucene
the qt module magic handles that automatically nowadays
Change-Id: If67a83f50c1593461ec3abfc32132b594fd9ee18
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Kevin Ottens [Wed, 1 Aug 2012 13:38:03 +0000 (15:38 +0200)]
Properly handle include cycles
Currently lupdate is just issuing a warning when it detects an
include cycle. Since it's not a full preprocessor, most of those
warnings are false positives, but they need special handling, this
patch provides that.
Now every result is stored as part of a cycle (so in the general
case a cycle of one file). When detecting a cycle, instead instead
of issuing a warning, we record the presence of the newly detected
cycle for later use and merge the other relevant cycles with it.
When retrieving results now it's not for a single file anymore but
for a complete cycle at once (which can turn out to be a cycle of
one file).
Task-number: QTBUG-6587
Change-Id: Ia12bc680e645b9704a3178e8a843a554a60811bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Pierre Rossi [Thu, 2 Aug 2012 10:12:30 +0000 (12:12 +0200)]
Add support for modular docs in QHelpGenerator.
Very cool.
Change-Id: Ic3332a4a780fb357138545117e78be641d2ea14f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 12:20:32 +0000 (14:20 +0200)]
Prepare QtHelp library for modularized documentation.
- Support ".." in QCH documentation file paths.
This essentially means that we stop using cleanPath, and where needed,
prepend the virtual folder name, followed by "/..", in front of the
original path.
- Remove com.trolltech default DocPath since this was not used anymore.
Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I7309805000f343e2f58c74cd0655a936399fd939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:56:29 +0000 (16:56 +0200)]
Add export macros to QtCLucene
QtCLucene is not the same library as QtHelp, so it can't use the same
macros and same #define as QtHelp.
Change-Id: Idefe46cbd8842f406131c8f041b531a92a2261a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 12:34:21 +0000 (14:34 +0200)]
Fix a crash in Assistant.
Change-Id: I8fa3f5845db515d5f9efc74acd392058ef1e1ec5
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 20:30:23 +0000 (22:30 +0200)]
Enforce sans-serif by default in assistant
Make the default font sans serif for HelpViewer's QWebView-based implementation
since it is what QTextBrowser uses by default, we probably want to blend in.
Change-Id: I07257d61cac9bffa28f90f31e352101b2e04cb0e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:14:06 +0000 (17:14 +0200)]
Set the Qt API level to compatibility mode in all tests.
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
Task-number: QTBUG-25053
Change-Id: I73b99cd8e948dbebcdac30c4e5f2772eacb958ab
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:05:16 +0000 (17:05 +0200)]
Non-UTF8 encoding for source code is deprecated.
So the encoding marker for translations is unnecessary. It's always
UTF-8 now.
Change-Id: I2013451f917fa6b58125a6cf3cd5db6c99ab0ff2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:12:41 +0000 (17:12 +0200)]
Restore the forms/ subdir that was lost in the uitools reimport
These files are referenced in the .qrc file, so they are necessary
during compilation.
The files were copied from the commit referenced in the initial import
of the qttools.git repository.
Change-Id: Id1f182a7a9dd4e08e63fb903b978de192b85cd98
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:10:20 +0000 (17:10 +0200)]
QHeaderView::setResizeMode is deprecated.
Replace with the Qt 5 name setSectionResizeMode.
Change-Id: I908e669708c3595f110e41774475eea4cbdb7325
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Toby Tomkins [Wed, 1 Aug 2012 02:34:47 +0000 (12:34 +1000)]
Remove phonon as per removal in qt5.
5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5
compilation, also remove it in this repository.
Change-Id: I31a3dd4a47bab49039af00b5e385eed61a1cc35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Corentin Jabot [Fri, 27 Jul 2012 16:00:18 +0000 (18:00 +0200)]
make lupdate compilable without qml/js support
In case the declarative module is not present.
Change-Id: I2652b245506e2a04c4e588f62de2a39ebf652677
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 07:41:41 +0000 (09:41 +0200)]
Mark QCLucene and QtDesignerComponents libraries as internal.
The QCLucene library is obviously internal, and the only headers installed
by QtDesignerComponents are apparently pch headers.
This causes the avoidance of creation of CMake files.
Change-Id: Icb0b7e4ad622af3b2bc37043678dd6dc134be724
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Sat, 23 Jun 2012 08:37:20 +0000 (10:37 +0200)]
Test that the package configs for QtTools work.
Change-Id: I366c5f0a964739cc0fc607c72cf1e42d7ea92f06
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 07:52:22 +0000 (09:52 +0200)]
Add the CMake directory created during unit testing to .gitignore.
Change-Id: I6835b9c034ab3ba1933bd8726c035a8c328daa4f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Stephen Kelly [Sat, 14 Jul 2012 11:29:55 +0000 (13:29 +0200)]
Generate a fatal error as appropriate.
Otherwise, subdirectories under directories which are added to
a resource file generate garbage in the binary.
The easiest way to see this is
cd tests/auto/corelib/kernel/qvariant
mkdir stream/qt4.9/somedir
make && ./tst_qvariant loadQt4Stream
Change-Id: I92e4660ffe41c96b41a393cd0748d9b05517aa8b
Reviewed-by: hjk <qthjk@ovi.com>
Casper van Donderen [Tue, 17 Jul 2012 08:01:49 +0000 (10:01 +0200)]
Export qhelpgenerator for use with qtPrepareTool()
Change-Id: I537864e24718cd5164f4346710c66cc83d649f0f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Sat, 14 Jul 2012 11:28:59 +0000 (13:28 +0200)]
Fix typo qith -> with
Change-Id: I71ee5f14c91f4265b71a1f097187408fb70f0867
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Jan-Arve Saether [Tue, 26 Jun 2012 08:43:17 +0000 (10:43 +0200)]
Enable modularization of translation files.
This is accomplished by introducing dependencies to catalogs.
Task-number: QTBUG-26138
Change-Id: Ia05918e1e043366ae0bf992f461275592f566c61
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Fri, 22 Jun 2012 09:18:11 +0000 (11:18 +0200)]
Update the export macros in qttools.git
Use the new, simpler QT_STATIC macro.
Change-Id: I44a3767d80ed7d468684698353c9af885a459ee8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Tue, 29 May 2012 16:52:01 +0000 (18:52 +0200)]
Change CONFIG += staticlib to CONFIG += static
That's the targetted, correct way of defining a static library.
Change-Id: I3a255dd1df213a470a36242869dd35a4bc283044
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 19:43:14 +0000 (21:43 +0200)]
use centralized handling of QT_BUILD_PARTS
Change-Id: I220d36267e36bd2993fc520dea1fdffa3405b0a5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Mon, 9 Jul 2012 15:19:35 +0000 (17:19 +0200)]
QtTools: Replace CONFIG+=help by QT+=help
Change-Id: I2e195430241288cf6e9fc809d4a1b0d6b0e79314
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 18:10:38 +0000 (20:10 +0200)]
"export" the linguist tools for qtPrepareTool() use
Change-Id: I2f7dee558e286e81b0f6a79bc428d1e5cda3321a
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Jarek Kobus [Thu, 5 Jul 2012 13:02:47 +0000 (15:02 +0200)]
Don't change the current page of mainwindow container
Task-number: QTBUG-12097
Change-Id: I5a4c7c5803b1f82d5ebdc1d61dc00d3dcd43a53f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 27 Jun 2012 12:43:05 +0000 (14:43 +0200)]
Designer: Fix crash when switching from docked to multiple windows.
Make sure the preference dialog is destroyed before changing the
UI mode by introducing a flag that is set on UI mode changes,
triggering the update afterwards.
Change-Id: I9c488ba6b1b24faccb0a1606994aaf0474b56fc2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Stephen Kelly [Fri, 22 Jun 2012 11:46:09 +0000 (13:46 +0200)]
Run the cmake unit tests as part of the qttools CI.
Change-Id: I565e715ba869298d4a8b9e4b42b7b41587336b9b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Yuchen Deng [Mon, 2 Jul 2012 13:55:38 +0000 (21:55 +0800)]
Fix compilation
Change-Id: I8e51a941c9ef6946fcc60a66cc33dba472959bf7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Mon, 2 Jul 2012 13:18:11 +0000 (15:18 +0200)]
cetest: remove support for X.sources of DEPLOYMENT variables
The .sources property has been deprecated in Qt 4.8.0 and
will be removed for Qt 5.
Task-number: QTBUG-3216
Change-Id: Ib37ef0913ddb16c89578f75277c41c27e2d8cdd1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Stephen Kelly [Mon, 2 Jul 2012 11:32:41 +0000 (13:32 +0200)]
Copy the LinguistTools macros to the build directory.
Allows running the unit test before installation.
Change-Id: I18947b625ad1a77ba4b7dd405ce5f1520b4d3125
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Yuchen Deng [Sun, 1 Jul 2012 08:23:06 +0000 (16:23 +0800)]
Fix cross compilation
Change-Id: I1c9fba9bcbec9cc2b9bcca7bbb77525173937a16
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Giuseppe D'Angelo [Wed, 27 Jun 2012 12:09:38 +0000 (13:09 +0100)]
Port QStandardItem/QStandardItemModel includes to QtGui
Change-Id: Ic2842dc4d1814e43b07faae0fd72fb2ce4ce1125
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Wed, 27 Jun 2012 07:30:09 +0000 (09:30 +0200)]
Create a Qt5LinguistTools config file in the build directory.
As it is not using qt_module_config, it is otherwise not created there,
which breaks CI.
Change-Id: Ia4264d721a4f4a70542bc50329fd77def23d3914
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Fri, 29 Jun 2012 13:08:42 +0000 (15:08 +0200)]
remove stale reference to QTDIR_build
the flag is never set anymore, and the condional requires() would never
be true, either.
Change-Id: Ia23f57263aead3dd869902b2ed8b9be0133a0c08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Wed, 27 Jun 2012 20:47:08 +0000 (22:47 +0200)]
Merge branch 'buildsystem'
Change-Id: Ibe002ec394142f4e2d36a6d7e1fc0e1239a68672
Friedemann Kleint [Wed, 27 Jun 2012 13:08:12 +0000 (15:08 +0200)]
QtTools/Linguist: Replace Q_WS_ by Q_OS_ where appropriate.
Change-Id: I009ebac85dd4c47afd042dba33edcda8212a812a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 May 2012 18:26:19 +0000 (20:26 +0200)]
purge QT_(SOURCE|BUILD)_TREE usage
Change-Id: I5e08266f27e1436f3c07a8f92b6d3565fbb304fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 10:42:47 +0000 (12:42 +0200)]
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
Change-Id: I64ce8134c471ccf674b6815878b4090a7eb8d961
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 09:25:06 +0000 (11:25 +0200)]
auto-generate module pris
Change-Id: I1ba2a287525556fcdc1c0db5a1ef3ade16c12eda
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Friedemann Kleint [Mon, 25 Jun 2012 10:58:01 +0000 (12:58 +0200)]
Clucene: Fixed MSVC2011 build.
This is basically taken from Qt 4.8 /
69f84b9514f8f22d27590ac890dbd20aec369702.
Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.
Change-Id: Ia733c3b51dafc5d22674cc3822e6305819582429
Initial-patch-by: Eugene Shcherbina <eugene@eshcher.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Stephen Kelly [Tue, 19 Jun 2012 16:05:44 +0000 (18:05 +0200)]
Allow the specification of includes in the lst-file in lupdate.
Change-Id: I95805637b7c1bb7f6774a47928f21701ba212298
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Wed, 20 Jun 2012 11:23:50 +0000 (13:23 +0200)]
Use app.arguments().size() instead of argc in the for loop
We're looping over the contents of arguments() anyway, and it is
more future proof to consider the size of the container in case
QCoreApplication ever consumes arguments like QApplication does.
Change-Id: Ic8ac49b910b13f8a6314447b132a788f6c38da20
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 20 Jun 2012 13:49:50 +0000 (15:49 +0200)]
Fix dependencies of the QtTools module.
- Remove phonon designer plugin.
- Disable the ActiveX designer plugin, which will later be moved
to the ActiveQt module.
Change-Id: I36240e9d22f852c2a3bbfcb00052221adfb2e681
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Stephen Kelly [Tue, 19 Jun 2012 15:53:22 +0000 (17:53 +0200)]
Handle files with includes from extra directories with lupdate.
Forward port of
7a6d2796e63a8a390bd86fe9a029c4add119132b in cmake.git.
Change-Id: I35d05a6160e192e9ea0966fdd2ebc21ce2d73d24
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Tue, 8 May 2012 18:25:43 +0000 (20:25 +0200)]
use depend_includepath
Change-Id: Ie22dbaa16f12044e95e1cdd813dd9daa2bf7ddcb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Tue, 19 Jun 2012 10:07:21 +0000 (12:07 +0200)]
Explicitly set QFormLayout::ExpandingFieldsGrow.
Mac has a different default value, causing the fields to have
a static size.
Task-number: QTBUG-26222
Change-Id: Ib983162dbfd61d083c842f87eac1570ae7dc3a7a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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)
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
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>
Marius Storm-Olsen [Wed, 11 Apr 2012 17:56:11 +0000 (12:56 -0500)]
Merge commit 'qt-v5.0.0-alpha1'
Change-Id: I5af4b98754ede311bfd4b2f9c77d76096447ea62
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>
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>