Browse Source

Merge pull request #876 from DonLakeFlyer/WindowsInstall

Windows install
QGC4.4
Don Gagne 11 years ago
parent
commit
ca990ff653
  1. 3
      QGCSetup.pri
  2. 2
      libs/opmapcontrol/src/core/pureimagecache.cpp

3
QGCSetup.pri

@ -197,7 +197,8 @@ WindowsBuild { @@ -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.

2
libs/opmapcontrol/src/core/pureimagecache.cpp

@ -223,7 +223,7 @@ namespace core { @@ -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";

Loading…
Cancel
Save