mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0029571: Samples: build qt samples together with OCCT
Extending CMake procedure by 'BUILD_MODULE_QtSamples' variable to switch on qt samples build. Implementation required: - union of occt_toolkit_tool.cmake and occt_toolkit.cmake files; - correction of qt samples sources by adding path to Qt 'plugins' folder. It helps to avoid definition of additional variable (QT_QPA_PLATFORM_PLUGIN_PATH) when staring sample.bat for qt samples; - executable processing is extended in cmake procedure by providing 'EXECUTABLE_PROJECT' variable. Now we need not specify custom processing for DRAWEXE in occt_toolkit.cmake
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
#include "ApplicationTut.h"
|
||||
#include "DocumentTut.h"
|
||||
|
||||
#include <OSD_Environment.hxx>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QStatusBar>
|
||||
#include <QMdiSubWindow>
|
||||
@@ -59,7 +61,8 @@ void ApplicationTut::onMakeBottleAction()
|
||||
|
||||
QString ApplicationTut::getTutResourceDir()
|
||||
{
|
||||
static QString resDir (qgetenv ("CSF_TutorialResourcesDefaults").constData());
|
||||
static QString resDir (OSD_Environment ("CSF_TutorialResourcesDefaults").Value().ToCString());
|
||||
if (resDir.isEmpty())
|
||||
resDir = QString (OSD_Environment ("CSF_OCCTResourcePath").Value().ToCString()) + "/samples";
|
||||
return resDir;
|
||||
}
|
||||
|
||||
|
8
samples/qt/Tutorial/src/FILES
Normal file
8
samples/qt/Tutorial/src/FILES
Normal file
@@ -0,0 +1,8 @@
|
||||
ApplicationTut.cxx
|
||||
ApplicationTut.h
|
||||
DocumentTut.cxx
|
||||
DocumentTut.h
|
||||
Main.cxx
|
||||
MakeBottle.cxx
|
||||
Tutorial-icon.ts
|
||||
Tutorial-string.ts
|
@@ -1,10 +1,17 @@
|
||||
#include "ApplicationTut.h"
|
||||
|
||||
#include <OSD_Environment.hxx>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QTranslator>
|
||||
|
||||
int main ( int argc, char* argv[] )
|
||||
{
|
||||
#if QT_VERSION > 0x050000
|
||||
TCollection_AsciiString aPlugindsDirName = OSD_Environment ("QTDIR").Value();
|
||||
if (!aPlugindsDirName.IsEmpty())
|
||||
QApplication::addLibraryPath (QString (aPlugindsDirName.ToCString()) + "/plugins");
|
||||
#endif
|
||||
QApplication a( argc, argv );
|
||||
|
||||
QString resDir = ApplicationCommonWindow::getResourceDir();
|
||||
|
Reference in New Issue
Block a user