Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
c6c39d6f
Commit
c6c39d6f
authored
Jan 23, 2009
by
dt
Browse files
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
parents
7f614f1a
4bca9d3d
Changes
6
Hide whitespace changes
Inline
Side-by-side
doc/qtcreator.qdoc
View file @
c6c39d6f
...
...
@@ -11,7 +11,7 @@
Development Environment (IDE) to develop Qt projects. It is available for
the Linux, Mac OS X and Windows platforms.
\note The current version of Qt Creator is 0.9.
1
(Beta). It is
\note The current version of Qt Creator is 0.9.
2
(Beta). It is
possible to edit source code, compile, run and debug applications; other
features are still under development. Please send bug reports and
suggestions to qt-creator@trolltech.com. To subscribe, send a
...
...
doc/qtcreator.qdocconf
View file @
c6c39d6f
...
...
@@ -17,15 +17,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.09
1
qhp.QtCreator.namespace = com.nokia.qtcreator.09
2
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 0.9.
1
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 0.9.
1
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 0.9.
1
qhp.QtCreator.filterAttributes = qtcreator 0.9.
2
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 0.9.
2
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 0.9.
2
# macros.qdocconf
...
...
@@ -201,5 +201,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright © 2008 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\"> </td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 0.9.
1
</div></td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 0.9.
2
</div></td>\n" \
"</tr></table></div></address>"
replaceVersion.sh
View file @
c6c39d6f
...
...
@@ -25,6 +25,12 @@ NEW_MINOR=`sed 's/^[0-9]\+\.\([0-9]\+\)\.[0-9]\+$/\1/' <<<"$2"`
OLD_RELEASE
=
`
sed
's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/\1/'
<<<
"
$1
"
`
NEW_RELEASE
=
`
sed
's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/\1/'
<<<
"
$2
"
`
OLD_THREE
=
"
${
OLD_MAJOR
}${
OLD_MINOR
}${
OLD_RELEASE
}
"
NEW_THREE
=
"
${
NEW_MAJOR
}${
NEW_MINOR
}${
NEW_RELEASE
}
"
OLD_DOT_THREE
=
"
${
OLD_MAJOR
}
\\
.
${
OLD_MINOR
}
\\
.
${
OLD_RELEASE
}
"
NEW_DOT_THREE
=
"
${
NEW_MAJOR
}
\\
.
${
NEW_MINOR
}
\\
.
${
NEW_RELEASE
}
"
OLD_DOT_FOUR
=
"
${
OLD_MAJOR
}
\\
.
${
OLD_MINOR
}
\\
.
${
OLD_RELEASE
}
\\
.0"
NEW_DOT_FOUR
=
"
${
NEW_MAJOR
}
\\
.
${
NEW_MINOR
}
\\
.
${
NEW_RELEASE
}
\\
.0"
...
...
@@ -38,8 +44,10 @@ echo "# Major '${OLD_MAJOR}' -> '${NEW_MAJOR}'"
echo
"# Minor '
${
OLD_MINOR
}
' -> '
${
NEW_MINOR
}
'"
echo
"# Release '
${
OLD_RELEASE
}
' -> '
${
NEW_RELEASE
}
'"
echo
"#-----------------------------------------------"
echo
"# Dots '
${
OLD_DOT_FOUR
}
' -> '
${
NEW_DOT_FOUR
}
'"
echo
"# Comma '
${
OLD_COMMA_FOUR
}
' -> '
${
NEW_COMMA_FOUR
}
'"
echo
"# 3 '
${
OLD_THREE
}
' -> '
${
NEW_THREE
}
'"
echo
"# Dot 3 '
${
OLD_DOT_THREE
}
' -> '
${
NEW_DOT_THREE
}
'"
echo
"# Dot 4 '
${
OLD_DOT_FOUR
}
' -> '
${
NEW_DOT_FOUR
}
'"
echo
"# Comma 4 '
${
OLD_COMMA_FOUR
}
' -> '
${
NEW_COMMA_FOUR
}
'"
echo
"#==============================================="
echo
...
...
@@ -85,7 +93,7 @@ sed \
mv
-f
"
${
TMPFILE
}
"
"
${
INSTALLER_RC
}
"
## Patch
installer.rc
## Patch
Info.plist
TMPFILE
=
`
mktemp
`
INFO_PLIST
=
"
${
SCRIPT_DIR
}
/src/app/Info.plist"
echo
"Patching
\`
${
INFO_PLIST
}
'"
...
...
@@ -95,6 +103,27 @@ sed \
mv
-f
"
${
TMPFILE
}
"
"
${
INFO_PLIST
}
"
## Patch qtcreator.qdocconf
TMPFILE
=
`
mktemp
`
QDOCCONF
=
"
${
SCRIPT_DIR
}
/doc/qtcreator.qdocconf"
echo
"Patching
\`
${
QDOCCONF
}
'"
sed
\
-e
"s/"
${
OLD_DOT_THREE
}
"/"
${
NEW_DOT_THREE
}
"/"
\
-e
"s/"
${
OLD_THREE
}
"/"
${
NEW_THREE
}
"/"
\
"
${
QDOCCONF
}
"
>
"
${
TMPFILE
}
"
mv
-f
"
${
TMPFILE
}
"
"
${
QDOCCONF
}
"
## Patch qtcreator.qdoc
TMPFILE
=
`
mktemp
`
QDOC
=
"
${
SCRIPT_DIR
}
/doc/qtcreator.qdoc"
echo
"Patching
\`
${
QDOC
}
'"
sed
\
-e
's/\(The current version of Qt Creator is \)'
${
OLD_DOT_THREE
}
'/\1'
${
NEW_DOT_THREE
}
'/'
\
"
${
QDOC
}
"
>
"
${
TMPFILE
}
"
mv
-f
"
${
TMPFILE
}
"
"
${
QDOC
}
"
## Go back to original $PWD
echo
"Leaving directory
\`
${
SCRIPT_DIR
}
'"
popd
&>/dev/null
||
exit
1
...
...
scripts/shipping/prepare-linux-qt-for-shipping.sh
View file @
c6c39d6f
...
...
@@ -2,7 +2,7 @@
version
=
4.4.3
workdir
=
/home/berlin/dev/qt-
${
version
}
-temp
destdir
=
/home/berlin/dev/qt-
${
version
}
-shipping
destdir
=
/home/berlin/dev/qt-
${
version
}
-shipping
/qt
# "/qt" suffix for Bitrock
dir
=
qt-x11-opensource-src-
${
version
}
file_tar
=
"
${
dir
}
.tar"
file_tar_gz
=
"
${
file_tar
}
.gz"
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
c6c39d6f
...
...
@@ -913,8 +913,9 @@ void DebuggerPlugin::readSettings()
#if defined(Q_OS_WIN32)
defaultCommand
.
append
(
".exe"
);
#endif
QString
defaultScript
=
ICore
::
instance
()
->
resourcePath
()
+
QLatin1String
(
"/gdb/qt4macros"
);
//QString defaultScript = ICore::instance()->resourcePath() +
// QLatin1String("/gdb/qt4macros");
QString
defaultScript
;
s
->
beginGroup
(
QLatin1String
(
"DebugMode"
));
QByteArray
ba
=
s
->
value
(
"State"
,
QByteArray
()).
toByteArray
();
...
...
src/tools/qtlibspatcher/qtlibspatchermain.cpp
View file @
c6c39d6f
...
...
@@ -46,7 +46,7 @@
"Trolltech/Code_less_create_more/Troll/4.4.3"
;
#else
const
char
*
const
oldSourceBase
=
"/home/berlin/dev/qt-4.4.3-temp/qt-x11-opensource-src-4.4.3"
;
const
char
*
const
oldInstallBase
=
"/home/berlin/dev/qt-4.4.3-shipping"
;
const
char
*
const
oldInstallBase
=
"/home/berlin/dev/qt-4.4.3-shipping
/qt
"
;
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment