Change-Id: I3827716fa6233493224cd89d8417b95e7d34a711
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit f7612278)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Also make registerShortcut set an application shortcut.
That is necessary when the user opened a separate editor window.

Change-Id: I366044b7acba51daca46a15a302a24b5b8e99cc1
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit 5c8f46d2)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The return value is always -1.

Change-Id: I19ede339e7557a794069b4dc991cb9f9a711caa9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

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

Change-Id: If1553b6472a1dc2e905f7a1d39c4c3038e878430
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

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

In the case of a shadow build, a relative local include will only
work by accident, if at all. Use a global one instead.

Change-Id: Idc2636d519ea19a3325c861cdcb1dcfb6e0a5920
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

This is fixing some anchor movement bugs.

This reverts commit ae409f8b.

Change-Id: Ibe9b8b2601e2bcd1c249b5feda06fb3a29482f4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

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

Change-Id: If4d51988df0b672dd44a19542209e1c85dd51cea
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

Task-number: QTCREATORBUG-9301

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

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

Inspired by Vim highlighting

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

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

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

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

The XML file now has a placeholdertext attribute that sets
the place holder text for the corrsponding QLineEdit.

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

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

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

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

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

No reason to initialize a QFileInfo for an empty string

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

This fixes the run options in the context menu.

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

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

This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

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

This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

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

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

Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f4d47945ba17db276e94046473816014ed0342e9)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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)
(cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0da7f097249f71726140a38647bb4824b09fad7b)

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

the functions are not versioned or scoped, so user-defined overloads would
mess up qmake's own feature files. it seems safer to break user projects
than to allow the user to break qmake.

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

it was merely an artifact of using QString::simplified() on the
unparsed (!) project code. there is no reason why anyone should actually
rely on it, so just remove it.

Change-Id: If9b957c4b1263f3990a2331f8851bb1c06154ea8
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/c3c4f1eb5301a4fda17a9a48012df45f9a0ee7a3)

we have been warning about such functions for a while now, now execute.
the qmake language is (generally) case-sensitive, so this wasn't all
that useful anyway.

Change-Id: I1388ac2d5a1104389aeb3347e739a0d5e69e138d
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from qtbase/b04192d94b9fb680f99ae38ff008919c0ad371ea)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

When writing a file with write_file() we have to inform the pro file parser
cache to discard the file if it's existent 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: Daniel Teske <daniel.teske@digia.com>

in the case of sprintf it's surprising, in the case of join it's
anti-thetical.

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

any of the directories may be the root, which would lead to double slashes
in the constructed filenames.

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

don't count parentheses, don't nest quotes, don't create empty elements.
the backslash still escapes only quotes (and itself) - $$list() (one of
the main users of this function) is commonly used with (windows) path
lists, so letting it escape anything would make a royal mess.

Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/6c22b9b3e86d1617665f7b81b105c032f43c6d72)
(cherry picked from qtbase/a5c2ab47867a558d6f8f62126fb8e4f2777cfe06)

this allows skipping an entire feature file if a condition is not
fulfilled, without putting the whole body inside a conditional.

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

we have proper fallback paths further down the line.

Change-Id: I3648cc985d21bbec4c2c24e179830db4467af210
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/0dedf8c3403923b963c51eb65d9cbe838d5ba0d4)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>