qt-based code is expected to be utf8-encoded nowadays. the respective
c++ interfaces have been purged in 5.0 already.

Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

there is no qt3support in qt 5 any more.

Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

at the time of release it will be almost five years since we introduced
TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of
a need to write such files any more - and this commit doesn't even
remove 1.1 reading capability (because it comes for free so far).

Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf
Reviewed-by: hjk <hjk121@nokiamail.com>

The wizard now behaves nicely when used as a child widget.

Task-number: QTBUG-29904
Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I0fa2c6d5bf04bb3cf9d0314207ccb0a21b928f22
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Change-Id: Idf1da5c69f90e4ce94319fc722180988cbc44dc5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Task-number: QTBUG-25872

Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

The property is a QString when set by the menu or a
PropertySheetStringValue when loading the form.

Breakage introduced by
8695c175

 .

Task-number: QTBUG-29234

Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>

Change-Id: If70901325b3f4d5cbda705e4261fc18ea97c1bc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a

it doesn't actually do anything useful for quite a while

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

Task-number: QTBUG-9502

Change-Id: Ic1b0e4abdf71022609a90fc00f29e493958d9feb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL



Change-Id: Ia9dd91fb4defea000d3df79006eba65e549a99e1
Reviewed-by: Jason McDonald <macadder1@gmail.com>

Change-Id: Ib2cffaddacdddcc84070310a7f8e7c387ef3972a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

QPointerBase is not public or exported and it is to be removed

Change-Id: I91d9cfc14db7e5bf1fe85279734e04486b3b483e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

-replaced "html" with "HTML"
-noted that the .qhp files are in the HTML directories

Task-number: QTBUG-29576
Change-Id: I0ba1c9534d730648c25dcdf15fcb1448fa9eb8fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Task-number: QTBUG-29499

This happend as nobody did inform the menu about the page changes,
the shortcut remained active even for the last viewer. Also make
some constructors and functions private, so we can no longer mess
from the outside with the viewers, except thru OpenPagesManager.

Change-Id: I2675996d4b30ab8b1db657e5157b497a73b96196
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: I09c9abb08ba9f1ba171bf468e6cbc9010aaf0b53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from qtcreator/52be02d1cbbf69d4f82c517c7b633ed3d13b1007)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

they are versioned nowadays

Change-Id: I136d9073acd9f2c19d1b41ed1d071250c8e86048
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Since linking against a statically build qtwebkit fails, fallback to
use QTextBrowser. I guess we need to fix static webkit builds first.

Change-Id: I1bc6c1ae70f0e57fa179a3ffe8750bde97809d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: Ic59e7fc11c9a67546a22901b82681dd75831455a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: Ib53e90616e5dc98d6fbfdef5172eb96216a6a60e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

this is undeniably a new feature, but it's needed for a bugfix.

Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/87054805872429c1c17135f9ae5364b050d3fdff)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.

Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/864e1ceaf628e823103ae2d28d2c983400ba38c7)

Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I4b6754c7bd513a2c479c52a0428bd7eee857c6ca
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7

Change-Id: I2a9a6613bad5de19fadc0361eda3fe7dbb4b0a44
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: I7ae99af02d5d61626eac97ddb8a6f62da9c2d638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Task-number: QTBUG-29218

Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html


Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

On Windows, filePath() was used for a function that was supposed to get
the bin directory for Qt. However path() should be used instead as this
will remove the filename from the originally obtained string.

Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: If70f67f3b8f9a2230cccff8a2682a7f1dcecfb73
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Adding bic data for the following modules:

 - QtCLucene
 - QtDesigner
 - QtDesignerComponents
 - QtHelp
 - QtUiTools

Change-Id: I1886fa9f6659c0a97d6b428d4667cd032f06afbd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>