Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ca990ff6
Commit
ca990ff6
authored
Oct 01, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #876 from DonLakeFlyer/WindowsInstall
Windows install
parents
8bb503d2
8747b7e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
QGCSetup.pri
QGCSetup.pri
+2
-1
pureimagecache.cpp
libs/opmapcontrol/src/core/pureimagecache.cpp
+1
-1
No files found.
QGCSetup.pri
View file @
ca990ff6
...
...
@@ -197,7 +197,8 @@ WindowsBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) mkdir release\\platforms
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\"
ReleaseBuild {
# Copy Visual Studio DLLs
# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
...
...
libs/opmapcontrol/src/core/pureimagecache.cpp
View file @
ca990ff6
...
...
@@ -223,7 +223,7 @@ namespace core {
qlonglong
id
=++
ConnCounter
;
Mcounter
.
unlock
();
#ifdef DEBUG_PUREIMAGECACHE
qDebug
()
<<
"Cache dir="
<<
dir
<<
" Try to GET:"
<<
pos
.
X
()
+
","
+
pos
.
Y
();
qDebug
()
<<
"Cache dir="
<<
dir
<<
" Try to GET:"
<<
pos
.
X
()
<<
","
<<
pos
.
Y
();
#endif //DEBUG_PUREIMAGECACHE
QString
db
=
dir
+
"Data.qmdb"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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