Commit 4802541d authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Merge branch 'master' of ../mainline into dui-editor

Conflicts:
	src/plugins/texteditor/basetextdocument.cpp
parents 4b125189 ae24255a
......@@ -69,12 +69,13 @@ doc-build
src/corelib/lib
src/network/lib
src/xml/lib/
run/*
# Binaries
# --------
bin/*.dll
bin/qtcreator.bin
bin/qtcreator_process_stub
bin/qtcreator_process_stub*
bin/qtcreator.exe
doc/qtcreator.qch
share/doc/qtcreator/qtcreator.qch
tests/manual/cplusplus/cplusplus0
#!/bin/sh
bindir=$(dirname "$(readlink -nf $0)")
if test "$(uname -m)" = "x86_64" ; then
libdir=$(cd "${bindir}/../lib64" ; pwd)
else
libdir=$(cd "${bindir}/../lib" ; pwd)
fi
libdir=$(cd "${bindir}/../lib" ; pwd)
LD_LIBRARY_PATH="${libdir}/qtcreator:${LD_LIBRARY_PATH}" exec "${bindir}/qtcreator.bin" ${1+"$@"}
......@@ -35,22 +35,24 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
}
}
linux-*-64 {
IDE_LIBRARY_BASENAME = lib64
} else {
isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
equals(TEST, 1) {
QT +=testlib
DEFINES += WITH_TESTS
}
IDE_SOURCE_TREE = $$PWD
sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
isEmpty(IDE_BUILD_TREE) {
sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx {
IDE_APP_TARGET = QtCreator
......
......@@ -2025,7 +2025,8 @@ static void qDumpQString(QDumper &d)
if (!str.isEmpty()) {
qCheckAccess(str.unicode());
qCheckAccess(str.unicode() + str.size());
if (!str.unicode()[str.size()].isNull()) // must be '\0' terminated
qCheckAccess(0);
}
P(d, "value", str);
......
......@@ -159,7 +159,7 @@
<shortcut id="QtCreator.ToggleSidebar" >
<key value="Alt+0" />
</shortcut>
<shortcut id="QtCreator.AboutWorkbench" >
<shortcut id="QtCreator.AboutQtCreator" >
<key value="" />
</shortcut>
<shortcut id="QtCreator.AboutPlugins" >
......
......@@ -60,7 +60,7 @@
<shortcut id="QtCreator.ToggleSidebar" >
<key value="Ctrl+0" />
</shortcut>
<shortcut id="QtCreator.AboutWorkbench" >
<shortcut id="QtCreator.AboutQtCreator" >
<key value="" />
</shortcut>
<shortcut id="QtCreator.AboutPlugins" >
......
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - Generic</value>
......@@ -23,4 +23,4 @@
$selection$
};]]></value>
</data>
</qtworkbench>
\ No newline at end of file
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - QObject</value>
......@@ -26,4 +26,4 @@ public:
$selection$
};]]></value>
</data>
</qtworkbench>
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - QWidget</value>
......@@ -26,4 +26,4 @@ public:
$selection$
};]]></value>
</data>
</qtworkbench>
\ No newline at end of file
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >/* ... */ Comment</value>
......@@ -20,4 +20,4 @@
<variable>Contents</variable>
<value type="QString" ><![CDATA[/* $anchor$$selection$$cursor$ */]]></value>
</data>
</qtworkbench>
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
......@@ -45,4 +45,4 @@
</valuemap>
</data>
</qtworkbench>
\ No newline at end of file
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >foreach statement</value>
......@@ -22,4 +22,4 @@
$selection$
}]]></value>
</data>
</qtworkbench>
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >if Statement</value>
......@@ -22,4 +22,4 @@
$selection$
}]]></value>
</data>
</qtworkbench>
</qtcreator>
<!DOCTYPE QtWorkbenchSnippet>
<qtworkbench>
<!DOCTYPE QtCreatorSnippet>
<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >if - else Statement</value>
......@@ -24,4 +24,4 @@
}]]></value>
</data>
</qtworkbench>
</qtcreator>
This diff is collapsed.
......@@ -4080,9 +4080,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
</message>
</context>
<context>
<name>Designer::Internal::WorkbenchIntegration</name>
<name>Designer::Internal::QtCreatorIntegration</name>
<message>
<location filename="../../../src/plugins/designer/workbenchintegration.cpp" line="+72"/>
<location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
<source>The class definition of &apos;%1&apos; could not be found in %2.</source>
<translation type="unfinished"></translation>
</message>
......@@ -6847,25 +6847,6 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Perforce::Internal::WorkbenchClientUser</name>
<message>
<location filename="../../../src/plugins/perforce/workbenchclientuser.cpp" line="+143"/>
<location line="+138"/>
<source>Perforce Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-99"/>
<source>Closing p4 Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to submit this change list?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PluginDialog</name>
<message>
......
include(../../../qtcreator.pri)
TRANSLATIONS = de ja
TRANSLATIONS = de it ja
# var, prepend, append
defineReplace(prependAll) {
......
......@@ -182,11 +182,7 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
#if defined(QT_ARCH_X86_64) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
pluginPath += QLatin1String("lib64");
#else
pluginPath += QLatin1String("lib");
#endif
pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
......
TEMPLATE = lib
TARGET = Aggregation
include(../../qworkbenchlibrary.pri)
include(../../qtcreatorlibrary.pri)
DEFINES += AGGREGATION_LIBRARY
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment