Commit Graph

1907 Commits

Author SHA1 Message Date
Liang Qi
4ddb9d15ce Distinguish chinese translations in settings
Task-number: QTCREATORBUG-8252

Change-Id: Iccf75baf05fe76cf0fd17e2e76af5b84674bbe34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-16 12:55:11 +01:00
Orgad Shaneh
10d22b0871 InfoBar: Prevent potential leak
Change-Id: I997e84554e56fe67cdde2801108562bb788506c4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-16 09:51:35 +01:00
hjk
8011a1646c EditorManager: OpenEditorsView: Remove unneeded one-cell layout
Change-Id: I063b00779e5acbfb307308d2107616990f0da010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-12 11:18:25 +01:00
Orgad Shaneh
10be8c9a48 InfoBar: Use Core::Id
Change-Id: I0918fbc20027a340facbedc685938a72d117d53b
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 15:34:50 +01:00
Orgad Shaneh
192e3f81b5 EditorManager: Refactor read-only message
Change-Id: Iceeb5ed0ecafa6593095bbeeab5819be6b8a28de
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 11:56:33 +01:00
Christian Kandeler
56ffd3c415 Core: Remove some unneeded ifdefs.
Change-Id: I90bcb0c05224d7ee9464ab1b22600ee2aba4c0ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-09 11:04:11 +01:00
Vasiliy Sorokin
a134076062 Showing asterisk on EditorToolbar for unsaved files with long names
Task-number: QTCREATORBUG-8003

Change-Id: If9ac6d75123e65486ff0cf243c9537805f3fe5a3
Reviewed-by: David Schulz <david.schulz@digia.com>
2012-10-30 08:36:30 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Aaron McCarthy
1b3909e45a Add option to place shadow build directory parallel to source tree.
This option requires that the projects directory setting is enabled.
For example with the following settings:

Projects directory: $HOME/depot
Build directory: $HOME/build

This will by default place the default shadow build directory in the
$HOME/build tree instead of adjacent to the source in $HOME/depot.

Change-Id: I74bfc00883d0479d5965350c760d14ef7602cc34
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-27 10:27:50 +02:00
Eike Ziller
ef91bd0505 Qt5: QUrl doesn't accept paths without leading slash anymore
Fixes e.g. opening help from the Locator help index filter

Change-Id: I3f7dae08aa83c36119a31d97232b9cdba0ba89fc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-10-26 14:54:17 +02:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
David Schulz
2ddd0251b4 Editor: Fix crash on navigate back
Task-number: QTCREATORBUG-8080

Change-Id: I782fbdda6b2ec46b7b8f4f3e84855b99d1847e7d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-24 16:17:47 +02:00
Montel Laurent
19e9277394 MimeType selection: Allow to enable/disable remove/edit buttons
Change-Id: Id13a6e775e5a476ec91329504cf7fbac8bd9c759
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-23 13:25:19 +02:00
Thomas Hartmann
e082b0f5e1 compile fix
Change-Id: Ic854161a3104349656fbb3035daeb4adb4e79ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 13:10:17 +02:00
Orgad Shaneh
ea83fe7423 Style: Fix sunken style for menu
Change-Id: I08aa20b6569cac814c479766842ff9422d1eb157
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-10-23 11:38:22 +02:00
Thomas Hartmann
e629a91fb3 Remove dependencies on Plastique and Cleanlooks
We want to move these styles out of the library so
we should not depend on them in creator.

This patch reverts 63cacc4534,
since it does not rely on ifdefs.

See also 5d0f7d2304 in master.

Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-10-23 11:33:28 +02:00
Tobias Hunger
f6d99b34d3 MIMEdatabase: Fix coding style issues
Change-Id: I6ae0f8aa965cd5152bc9bc386c10be07212ae267
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-22 20:05:51 +02:00
Jens Bache-Wiig
a7eea18282 Revert "Disable theming of menu bar."
This reverts commit 7b8cd42729.

This basically makes creator looks uglier on most platforms
while not really fixing anything on Ubuntu. The menubar is
on ubuntu (and mac) not shown in natively compiled versions
so it effectively fixes nothing, but makes the appearance
inconsistent on other platforms.

Change-Id: I4576b4dcc722dca59a7480eba41ce8efa970533b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-22 18:22:33 +02:00
Tobias Hunger
8c980f5a4e VCS: Work with canonical paths when looking for toplevel directories
Change-Id: I2b2f3f76f04af298dcc6f38e1c5f1dd4555e2024
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-22 16:08:30 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Eike Ziller
ae6c5eaa0c Mac: Don't link to 10.7+ api even when compiling there.
The 'fullscreen' feature uses constants that are only available
on 10.7 or later, but when compiling on 10.6 we just defined the
constants ourselves.
With this patch we define the constants ourselves even on 10.7 and
later, to avoid linking to 10.7-only symbols when compiling on 10.7
or later, making it possible to run a Qt Creator compiled against
a 10.7 SDK also on 10.6.

Change-Id: I65236a85bdda3473fab0e424270b96880943d685
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-19 16:33:41 +02:00
Jens Bache-Wiig
5d0f7d2304 Remove dependencies on Plastique and Cleanlooks
We want to move these styles out of the library so
we should not depend on them in creator.

Change-Id: I5326285d880c5e85d8d5ccdeca36fba30cf53ae0
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-19 15:48:11 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
2012-10-16 17:42:10 +02:00
Erik Verbruggen
788334b2b9 Fix: old-school ObjC about which modern compilers complain.
Change-Id: I0eb0a75b15b5399ba286829cd424dde4301db492
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-16 11:32:14 +02:00
Daniel Teske
7ee4968b26 Fix additional output omited warning
Task-number: QTCREATORBUG-8004
Change-Id: Ic45d62fe3bf36187bb88a84a019fc00dc01976fc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-12 16:28:35 +02:00
Daniel Teske
91fd10a9df New CMake Project: Don't show empty message box on cancel
Task-number: QTCREATORBUG-7048

Change-Id: I3e79c78429c2ae5cfcc9da126f34e5f88bdd0c13
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-10 15:44:46 +02:00
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
2012-10-09 14:27:29 +02:00
Friedemann Kleint
7e33227146 Replace remaining Q_WS_WIN by Q_OS_WIN.
Task-number: QTCREATORBUG-72
Change-Id: I36f532ebd61472cd6e3d8e63decc96613cc7fab4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 12:36:57 +02:00
Friedemann Kleint
0869a13938 Display proper overlay icons on Windows/Qt 5.
Task-number: QTBUG-27450

Change-Id: I521823dc586c304a5242a79f04489e5bc0fdb702
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 12:34:34 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Tobias Hunger
5554e3616e Fix some more copyright headers that got missed somehow
Change-Id: I486c5c5c7c7330593ea7812dff172ba70d0fe86b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 10:56:34 +02:00
Eike Ziller
1d0b58cd00 Fix installation of desktop icons.
The icons are referred to with the name QtProject-qtcreator in the
desktop file.

Task-number: QTCREATORBUG-7955
Change-Id: Iaf6e270acdf0ac3259169dc39943bc78e33e0d96
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 16:18:35 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
2012-10-05 20:51:31 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Tobias Hunger
0bcf6930d3 Add Close button to window asking what to do with changed documents
Add a close button to window asking what to do with documents that
were changed outside Creator. Finally a simple way to get rid of
open moc-files that trigger this window over and over again:-)

Task-number: QTCREATORBUG-7360
Change-Id: I7a373ed60d85d810caf6604bc7dae7bb7fa186a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 16:51:18 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
2012-10-04 12:23:39 +02:00
Nikolai Kosjar
ed86a7ca58 Get rid of some Q_WS_X11.
This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 08:00:26 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Orgad Shaneh
192bd214c7 qml files: Use buildDirectory as includePath for app_version_header
Add some missing app_version_header dependencies

Change-Id: Ieaa16e9a1bdace9032ef78a3329dfac60d28e99a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-01 17:37:26 +02:00
Leena Miettinen
e06582731e UI text: fix capitalization for debugger strings
Change-Id: If70418319529f75e893f3d5b60cb7dfa6a739dca
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 15:08:01 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
Christian Kandeler
89fa7823b3 Replace all remaining functions deprecated in Qt 5, if possible.
These are:
    - QInputDialog::getInteger() [-> getInt()]
    - QKeySequence::operator QString() [-> toString()]
    - QRegion::intersect() [-> intersected()]
    - qVariantCanConvert() [-> QVariant::canConvert()]

Plus some left-over occurrences of qFindChild() and
QAbstractItemModel::reset() that were missed by the
respective earlier patches.

All deprecated features still left are not trivially
replaceable, i.e. the code using them cannot be made
to compile with both Qt 4 and Qt 5.

Change-Id: I32541681bbf66b0fef78f5c7025521f9ff84f463
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-25 11:01:04 +02:00
Christian Kandeler
aef4280bc1 Do not use QWeakPointer to track QObjects.
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-25 10:45:36 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-21 21:03:48 +02:00
Christian Kandeler
938612c35e Do not use QAbstractItemModel::reset().
Change-Id: Ie49bdf576a6d3543aef6df133b27c8827775c935
Rationale:
    a) It is conceptually cleaner to do the changes to the model
       in between calls to beginResetModel() and endResetModel,
       respectively.
    b) The function is deprecated in Qt 5, for exactly that reason.
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-20 11:11:45 +02:00
Christian Kandeler
1b3d637c1b Replace qVariantValue() with qvariant_cast().
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.

Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-20 09:41:37 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00