feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,748 Commits 108 Branches 368 Tags
1731911c4029d1b51a226e91a702f21bd13f108a
Commit Graph

2056 Commits

Author SHA1 Message Date
Robert Loehning
a7f17f8bdb Compile fix 
Change-Id: I1999e7ccc7e7fe45d656a6aa1ed7d51d827194d7
Reviewed-on: http://codereview.qt-project.org/6367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 20:00:00 +02:00
Friedemann Kleint
dd078ede85 Debugger: Compile manual debugger tests and dumber lib with Qt5. 
Introduce conditionals in the profiles and source code to
be able to test Qt 4 and Qt 5.

Change-Id: I73df5558f2945742d3e56f94baca0ee4d5f9dab8
Reviewed-on: http://codereview.qt-project.org/6330
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 18:32:05 +02:00
Kai Koehne
43aa3afb85 WelcomeScreen: Use ListView instead of Repeater for news 
This reduces number of objects created on startup, and also
allows us to simplify the logic a bit.

Change-Id: I6c7c2c5e537ff9a1882e133551f89c056cbe4fe5
Reviewed-on: http://codereview.qt-project.org/6359
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-10 17:38:30 +02:00
Eike Ziller
9b81dc17a4 Merge remote-tracking branch 'origin/2.4' 2011-10-10 15:29:31 +02:00
Fawzi Mohamed
df4b934086 gdb: workaround to lookup anonymous namespaces 
work around for http://sourceware.org/bugzilla/show_bug.cgi?id=13269

Change-Id: Ibfaf409d48146bbed09c0e563c140a1b7a712d4f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-on: http://codereview.qt-project.org/6179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 14:36:05 +02:00
Eike Ziller
9057d87805 Merge remote-tracking branch 'origin/2.4' 2011-10-07 08:42:47 +02:00
Eike Ziller
37b05178c3 Merge remote-tracking branch 'origin/2.3' into 2.4 2011-10-07 08:42:00 +02:00
Yuchen Deng
237ddd0f91 Snippets: Add 'switch' trigger for C++ code snippets 
Change-Id: Id8f860e1469d7e01e42fb39d3273817623aeded6
Merge-request: 2207
Reviewed-on: http://codereview.qt-project.org/6166
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-06 16:46:18 +02:00
Yuchen Deng
625b0ae6eb Snippets: Put the cursor in a more useful final position 
e.g.
for (int $var$ = 0; $var$ &lt; $total$; ++$var$) {
$$
}

In final, we need put the cursor at the $$ position.
This makes the code easier to write.

Change-Id: Ied1e6f6bc15277dae43d3052bfb2543124afcb82
Merge-request: 2207
Reviewed-on: http://codereview.qt-project.org/6165
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-06 16:45:56 +02:00
Eike Ziller
ae3a833b8c Commit things that went missing from 2a4a56b2be 
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-06 09:52:22 +02:00
Jure Repinc
00b50ca5f8 Updated Slovenian translation for Qt Creator 2.3 
Change-Id: I591849cac96b11d45dc025dbd3cee64d093dfdaf
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-05 20:15:08 +02:00
Eike Ziller
2a4a56b2be Load plugins from user config directory too. 
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-05 18:32:10 +02:00
Thomas Hartmann
d74a866bc6 QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS 
Allows using qml files referencing qrc resources in the designer.

Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:17:48 +02:00
Thomas Hartmann
e2e69d3e72 QmlDesigner.instances: create working stand-in object 
Create an Item as stand-in.

Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-05 17:15:02 +02:00
Thomas Hartmann
4fdbb9a6ad WelcomePage: reducing size of view 
Otherwise we might get an unnecessary scrollbar.

Change-Id: I12ab2288a02f32f542420b0e979c24aeaa00522d
Reviewed-on: http://codereview.qt-project.org/6063
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:14:50 +02:00
Thomas Hartmann
0f62ea2597 WelcomePage: fix tabbar 
Change-Id: Ic45a2bbc4773e903d8fa955b519171bed935f38e
Reviewed-on: http://codereview.qt-project.org/6062
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-05 17:14:40 +02:00
Christian Kamm
0132e23385 Qml snippets: Improve NumberAnimation and PropertyAction. 
Change-Id: I684a764797cd75a231f3da611ca6afeabdd48f61
Reviewed-on: http://codereview.qt-project.org/5835
Reviewed-by: Lasse Holmstedt
 2011-10-05 09:07:29 +02:00
Christian Kamm
5ce24ce06a Qml plugin wizard: Add uri annotation. 
Change-Id: Ie207fe674ac92b5cbcace054f452dec5300e1222
Reviewed-on: http://codereview.qt-project.org/5833
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-04 10:32:29 +02:00
hjk
70aa191b34 plain c++ app wizard: change name from 'qmake console' 
Change-Id: I1e3b094c70d8f887d3cd451c961ae067b4423289
Reviewed-on: http://codereview.qt-project.org/5467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-29 16:42:39 +02:00
Thomas Hartmann
e108cf435d WelcomePage: hide buttons if not enough space 
Change-Id: Ib33ddc8e060c2542e98dbf10b52efcfc3f010309
Reviewed-on: http://codereview.qt-project.org/5732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-29 08:49:16 +02:00
Thomas Hartmann
fe10bfe938 WelcomePage: layout change 
The navigation bar now takes the complete width.

Change-Id: Ifc9ad9e7dd00e93d0946a712fdbb04ba41939482
Reviewed-on: http://codereview.qt-project.org/5731
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-29 08:49:00 +02:00
Thomas Hartmann
1f9fb21c82 WelcomePage: fix for painting bug 
The width and height is defined for the designer.

Change-Id: I8ac941a417f16f1cc960ef72395c197a545168bf
Reviewed-on: http://codereview.qt-project.org/5730
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-28 15:50:30 +02:00
Thomas Hartmann
d73afb522a WelcomePage: nicer margins for HeaderItemView 
Change-Id: Ia2ebedc3ca8b2077046093b3a4e229d661ea5e01
Reviewed-on: http://codereview.qt-project.org/5729
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-28 15:50:05 +02:00
Thomas Hartmann
e8e5760300 WelcomePage: polish RecentProjects and RecentSessions 
Change-Id: If78338c6a7b2bc534ccdf7065d361fcebba710ea
Reviewed-on: http://codereview.qt-project.org/5724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-28 15:45:28 +02:00
Thomas Hartmann
49c8a3e101 WelcomePage: no fixed sizes from buttons and tabs 
Change-Id: Ie110cb3ad4d4aa355fcba1df5356cc9e4f1e3cfc
Reviewed-on: http://codereview.qt-project.org/5723
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-28 15:44:39 +02:00
Thomas Hartmann
f50247187d WelcomePage: polishing the welcome page 
Major visual upgrade and refactoring.
I also added dummydata and a qmlproject file.

Change-Id: I5ebc6dfb4718a37bb20766669272b85bc9316316
Reviewed-on: http://codereview.qt-project.org/5708
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-28 12:53:46 +02:00
Eike Ziller
faa792f3cd Use absolute path for xterm on Mac and remove unused file. 
xterm is (no longer?) in the PATH on Mac, so we need to point to it
directly.

Task-number: QTCREATORBUG-6150
Change-Id: I84202d0ebac1b8875c890116cce960898f65e5f9
Reviewed-on: http://codereview.qt-project.org/5303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-09-27 17:42:00 +02:00
hjk
10d3d00c76 a simple 'new project' wizard for a plain C project 
Change-Id: Ie3102362af67858790ff3121d2db56a7183906d4
Reviewed-on: http://codereview.qt-project.org/5468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-27 16:19:21 +02:00
Friedemann Kleint
15c5e2f2e4 L10n: First German translation for 2.4 except QtTest, purged. 
Change-Id: I4351643ae55dd15a48021d35792f07e040f1c721
Reviewed-on: http://codereview.qt-project.org/5599
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-09-27 09:42:05 +02:00
Friedemann Kleint
580f834a5d tr()-Fixes for 2.4 
Change-Id: I151e75ebec7bff17a3779f1b367849ca514512c6
Reviewed-on: http://codereview.qt-project.org/5550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-09-26 16:54:45 +02:00
Christian Kamm
2b205f6907 QmlJS: Update Qt 5 builtin type information. 
Change-Id: I5eab75a46c2c0ab167e14841992a7187eb37bdfd
Reviewed-on: http://codereview.qt-project.org/5310
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-26 12:04:25 +02:00
Victor Ostashevsky
fd4078f963 Ukrainian translation updated 
Merge-request: 395
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Idc14cea2df660b3bf0905c5b28748adbee904ee7
 2011-09-23 16:52:56 +02:00
hjk
56a05bf287 replace 'QMake Console' with 'Plain C++' 
Change-Id: I26b29ce0e62e6470629117ff21412a4cfbe74488
Reviewed-on: http://codereview.qt-project.org/5306
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 12:05:18 +02:00
hjk
13418a2086 fix string in 'qmake console' wizard 
Change-Id: I0cf1b405b9df2af681c87f1636d3457afba0d86e
Reviewed-on: http://codereview.qt-project.org/5305
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:57:05 +02:00
Yuchen Deng
cc4e2a445c Creates a pure console project using QMake, not using Qt library. 
Merge-request: 386
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I1292faa757d7974eb35c1d463d75bc53f8044c41
Reviewed-on: http://codereview.qt-project.org/5304
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:56:56 +02:00
Eike Ziller
8840168fc5 Revert "QmlDesigner: bug fix for components" 
Fix wasn't fixing anything, the slash is not in libraryPath but
in the string that is appended to it.

This reverts commit 95009e0a41.
 2011-09-21 08:31:14 +02:00
Marco Bubke
80c1e74abd QmlDesigner.NodeInstances: Change Assert in exit 
Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 17:06:49 +02:00
Thomas Hartmann
8e9da5f797 QmlDesigner.instances: support for auxiliaryData @NodeInstance 
This allows overwriting values in node instances only.

Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867
Reviewed-on: http://codereview.qt-project.org/4924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:42:42 +02:00
Thomas Hartmann
95009e0a41 QmlDesigner: bug fix for components 
QLibraryInfo::location(QLibraryInfo::ImportsPath) might miss the '/'
at the end.

Change-Id: I552cef7efce7644fad82247850d8853c72edd0ea
Reviewed-on: http://codereview.qt-project.org/5150
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-19 17:15:13 +02:00
hjk
4759d8cef4 debugger: fix a wrong sanity check in the dumpers 
Change-Id: Ie2dce425cf1204f22bb752bd400bc98211b45a63
Reviewed-on: http://codereview.qt-project.org/5126
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:39:24 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Orgad Shaneh
3503731abd Dumper: QHash: corrected variable usage 
Merge-request: 389
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I331cef5cff4d8a21e1104efffe5896f944573d7d
Reviewed-on: http://codereview.qt-project.org/5117
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:55 +02:00
hjk
18f6c5e457 debugger: mark optimized out values as such 
Change-Id: I57fedc5a2525e7e520e9ba8586e5d5f3eb4da091
Reviewed-on: http://codereview.qt-project.org/5005
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 15:05:55 +02:00
hjk
cdbd390475 fix 'analyse' in French translation 
Change-Id: Ie4edae18de3dd3444a55619d303704a8b13f65bd
Reviewed-on: http://codereview.qt-project.org/4966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 12:21:58 +02:00
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
 2011-09-15 11:50:29 +02:00
Sergey Belyashov
ee439129c4 Updated Russian translation 
Merge-request: 384
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I73077a68f3c674f32198a71eeafc60115f2465cc
 2011-09-14 17:38:47 +02:00
Orgad Shaneh
5734697435 Dumper: Fixed wrong function call 
Merge-request: 383
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I4d8c60f8877f6771783ba368050b8bce8891ba9e
Reviewed-on: http://codereview.qt-project.org/4757
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-13 12:51:15 +02:00
Kai Koehne
cdbb6f2cb9 QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian 
The .prf to add the dependency is called qt-components.prf . This broke
building a SmartInstaller package.

Task-number: QTCREATORBUG-6075
Change-Id: I816eac60ab15f40ffc9d3c866f0bf695bfa0983e
Reviewed-on: http://codereview.qt-project.org/4641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-12 11:24:19 +02:00
Kai Koehne
c00ee6701b QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan 
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath

1c93b10b0a/diffs

Change-Id: I4342c567265d192a580d572c6bec8d28ab363120
Reviewed-on: http://codereview.qt-project.org/4275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-12 10:22:06 +02:00
Marco Bubke
9837dadbcb QmlDesigner.NodeInstances: Refactor isManipulatable to isChangeable 
Change-Id: Icfc508e1549f4cfbcdda09b4611b2d66b4e2de1d
Reviewed-on: http://codereview.qt.nokia.com/4287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:55 +02:00