summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-04-17 12:09:14 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-04-17 13:29:09 (GMT)
commit8b166186c1446ebd13b2a7d0ab019c828915f4c2 (patch)
tree64651e81e6fe8f81be591bf221437942f7f53aa5
parent0dd4bef3cf108a57ff6bea2ae1bf7b18b48b90f5 (diff)
downloadQt-8b166186c1446ebd13b2a7d0ab019c828915f4c2.zip
Qt-8b166186c1446ebd13b2a7d0ab019c828915f4c2.tar.gz
Qt-8b166186c1446ebd13b2a7d0ab019c828915f4c2.tar.bz2
Fix a couple more unmaintained version numbers.
I have now inspected all 4.x.y version numbers appearing in the depot. All remaining instances appear to be acceptable. Reviewed-by: Trust Me (cherry picked from commit a46f54e0ad78ccb4ffaeee6befc7429f93740375)
-rw-r--r--FAQ.txt2
-rw-r--r--doc/src/deployment.qdoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/FAQ.txt b/FAQ.txt
index f20d10b..1d2266d 100644
--- a/FAQ.txt
+++ b/FAQ.txt
@@ -8,7 +8,7 @@ to Unix style line endings (LF). To avoid this problem, uncompress the file
again and give the option "-a" to unzip, which will then add the correct line
endings.
-Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe
+Q: I'm running Windows XP and I downloaded the qt-win-eval-%VERSION%-vs2008.exe
version of Qt. However, when I try to run the examples I get an error saying:
"The application failed to start because the application configuration is
incorrect. Reinstalling the application may fix this problem.". I reinstalled
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index f2f76a9..1f0b3ca 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -911,7 +911,7 @@
Then qApp->libraryPaths() would return something like this:
"C:/customPath/plugins "
- "C:/Qt/4.5.0/plugins"
+ "C:/Qt/%VERSION%/plugins"
"E:/myApplication/directory/"
The executable will look for the plugins in these directories and