1.10.0a
This commit is contained in:
parent
94c3f5e35b
commit
713f6353dc
|
@ -21,8 +21,8 @@
|
|||
#ifndef _MY_VERSION_H
|
||||
#define _MY_VERSION_H
|
||||
|
||||
#define MY_VERSION_BINARY 5,66,1
|
||||
#define MY_VERSION_STRING "5.66.1"
|
||||
#define MY_VERSION_BINARY 5,66,0
|
||||
#define MY_VERSION_STRING "5.66.0"
|
||||
#define MY_ABI_VERSION 0x56500
|
||||
|
||||
// These #defines are used by either Resource Compiler or NSIS installer
|
||||
|
|
|
@ -403,12 +403,16 @@ void CBoxTypePage::OnAdvanced()
|
|||
if (m_bInstant)
|
||||
{
|
||||
QString BoxName = m_pBoxName->text();
|
||||
#ifdef USE_COMBO
|
||||
int BoxType = m_pBoxType->currentIndex();
|
||||
#endif
|
||||
|
||||
wizard()->restart();
|
||||
|
||||
m_pBoxName->setText(BoxName);
|
||||
#ifdef USE_COMBO
|
||||
m_pBoxType->setCurrentIndex(BoxType);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -68,8 +68,8 @@ private slots:
|
|||
void OnAdvanced();
|
||||
|
||||
private:
|
||||
QComboBox* m_pBoxType;
|
||||
#ifdef USE_COMBO
|
||||
QComboBox* m_pBoxType;
|
||||
QLabel* m_pInfoLabel;
|
||||
#endif
|
||||
QLineEdit* m_pBoxName;
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#define VERSION_MJR 1
|
||||
#define VERSION_MIN 11
|
||||
#define VERSION_REV 1
|
||||
#define VERSION_UPD 0
|
||||
#define VERSION_REV 0
|
||||
#define VERSION_UPD 1
|
||||
|
||||
#ifndef STR
|
||||
#define STR2(X) #X
|
||||
|
|
Loading…
Reference in New Issue