GitLab

Change-Id: I4180bdc173235497f40da2df1ecd5b20048745e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

On a debug break, inspector tools cannot be used as the
gui thread is blocked.

Task-number: QTCREATORBUG-5466
Change-Id: I808d751b1ade7e4a5c98e87fec7bb4cb02715ad8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Resources addressed as urls in offline css files were not loaded
(e.g. breadcrumb icons) due to the base url not being setup and
therefore defaulting to the main page, when it should have been
set to the url of the corresponding style sheet to make relative
urls work correctly.

This also eliminates the need for the workaround introduced earlier.

Task-number: QTCREATORBUG-8211

Change-Id: Icf365781544255e322259262ea6a19a0b1dc7a25
modified:   src/plugins/help/helpviewer_qwv.cpp
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
(cherry picked from commit b5bfb815

)
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

Change-Id: If359d56bf325d24a4e127c385a3925a5e8ee6701
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Task-number: QTCREATORBUG-8256

Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

The HTML.templatedir is no longer used in Qt 5. Instead, the files
are resolved relative to the referencing qdocconf.
So we set the templatedir to the path of the qdocconf (for Qt 4)
and change the references to be relative to that path.
Also, it's HTML.extraimages in Qt 5, instead of extraimages.HTML

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

Change-Id: Id4b5a2bbf3d6498b1439abbb6fe204bd3db39620
Reviewed-by: hjk <qthjk@ovi.com>

Especially important if you already assigned the file types
to a different application, or to keep defaults for VS users.

Depends on: https://codereview.qt-project.org/#change,38650



Change-Id: I2b272c25e03bcc264ca73450fd26aa82ec30c296
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Qt5 splits the translations into modules as well. The deployqt
script was only copying specific translation patters from Qt,
now we just copy all .qm files from Qt to Qt Creator.

Change-Id: I02302e3f8f6b4673979559ce6cd2a32271b554a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTBUG-28393

Change-Id: I50a1b88c1711f0577843da81c095ebb7ca576077
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

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

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

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

Task-number: QTCREATORBUG-8272

Change-Id: I248ee83c5f6b5db4189ac1b5458ba5f884a996a9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Actually this can lead to crashes if passing the QtQuick1 import
path to qmlscene.

The removed code was introduced in 404186a9

. However,
the Qt import path for the code model is also added in
QmlProject::refresh().

Task-number: QTCREATORBUG-8365
Change-Id: I8581ce3d67c83c0f27d7b8aefedf9765935bedbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Broke while fixing the flag handling in editor manager.

Change-Id: Id743de099b3c193dcbf1dc55b4372217c691488a
Reviewed-by: David Schulz <david.schulz@digia.com>

Compilation on mac with latest qt5 fails with

   fatal error: 'QWebSettings' file not found

The compiler call adds "include/QtWebKitWidgets" to include path,
not "include/QtWebKit" . This might be a qmake related issue on mac.
Attempt to fix it by adding an explicit webkit dependency.

Change-Id: I032dd4dda7371a8d477f8544b0ba0004856f3d76
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

There basically just no sense for directories to have line number
suffixes, so we just remove that part.

Task-number: QTCREATORBUG-8272
Change-Id: Ia103ed15cd7ab00fb2d5bb692423e8542722fa31
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Got broken in cb18283d

.

Change-Id: I402f2efa711b6dc42d5d6363b07a98560c942e33
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Depends on: https://codereview.qt-project.org/#change,38650



Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Change-Id: I39b8284f77eb0420e63e752d7dd8881d24133d09
Reviewed-by: Liang Qi <liang.qi@digia.com>

Task-number: QTCREATORBUG-8297
Change-Id: Ie19534c669a1160a0acce8a037016b1f3007cb6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

m_isDefaultKit is changed to wrong value during apply() process,we need
to keep the value so that the rest of the logic works correctly.

Task-number:QTCREATORBUG-8205
Change-Id: Id25e56273ed06957d0a26d893ec26b9bf73864fa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I3bb45142a17971d21bd7e840ee0397bd49ed4469
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Task-number: QTCREATORBUG-8174
Change-Id: I9858ff5c24e80ed1f4375b2f4076bc74832bb217
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Id30080cebd7aeb0917516d7d94200f90bd531397
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Those look ugly.

Change-Id: I984060aaddf3294edf748a4c5c167efba7e40da8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

broke with 6e432b9d4e99ca233fb687be142b8782342f41d7

Change-Id: I67bda87a4fd0f9e0c2305843ae732b3bb66bf0c8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

This patch reverts 2b0c1fb3 and
affd4b9c



Change-Id: I65daf80a0e510f4103c2f2714a3ee583207e53d0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

This is needed on Windows for QML since QML always
checks for capitalization.

Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: I011464288f6052bfe19452b8ce555d6c462e15dd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Qt now generally expects styleObject to be set
during style draw calls.

Change-Id: I148d0a4e95a60c35fc6dc2b34cd0ba8d598cf7c3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Work around QTBUG-17529 by normalizing paths first.

Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: Ib7a52c81cf546d022b9db8402e225c8d3c10c0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

QAbstractFileEngine is in a private header in Qt 5

Change-Id: I2f3317e48274392cda853ebf69ed96a662763094
Reviewed-by: hjk <qthjk@ovi.com>

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

Override any QtLibraryInfo settings.

Change-Id: Ib931d132975769a2ab90f832b672bc6740138841
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

QmlProjectApplicationWizard now has a version for Qt Quick 1.1
and one for Qt Quick 2.

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

QTBUG-3570 doesn't look like being fixed in Qt5.

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

Change-Id: Ib8c5766171aa87c112286073ef82e776a0dc45e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Qt 5 installs its documentation directly in QT_INSTALL_DOCS, not in a
qch subdir, so we just check both for qch files.

Change-Id: I7360d9695954233437f2042f35b6de194662e623
Reviewed-by: hjk <qthjk@ovi.com>